From 3acaff8c5509606b7a024523d109d92e5ba83549 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sun, 24 Mar 2013 22:53:46 +0100
Subject: [PATCH] correct uninstall entries

---
 CLIENT_DATA/delsub3264.ins                  | 40 +++------------------
 CLIENT_DATA/opsi-apache.directorystudio.ini |  4 ---
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins
index 6fb74cf..dc2993c 100644
--- a/CLIENT_DATA/delsub3264.ins
+++ b/CLIENT_DATA/delsub3264.ins
@@ -72,26 +72,10 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_old_32]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; maby better Call as
-; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
-; "$UninstallProgramOld32$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgramOld32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel 
+"$UninstallProgramOld32$" /S
 
 [Winbatch_uninstall_32]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; maby better Call as
-; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
-; "$UninstallProgram32$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel 
+"$UninstallProgram32$" /S
 
 [Files_uninstall_32]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
@@ -99,26 +83,10 @@ LinkFolder_uninstall
 delete -sf "$InstallDir32$\"
 
 [Winbatch_uninstall_old_64]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; maby better Call as
-; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
-; "$UninstallProgramOld64$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgramOld64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+"$UninstallProgramOld64$" /S
 
 [Winbatch_uninstall_64]
-; Choose one of the following examples as basis for program uninstall
-;
-; === Nullsoft Scriptable Install System ================================================================
-; maby better Call as
-; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10
-; "$UninstallProgram64$" /S
-;
-; === Inno Setup ========================================================================================
-; "$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
+"$UninstallProgram64$" /S
 
 [Files_uninstall_64]
 ; Example for recursively deleting the installation directory:
diff --git a/CLIENT_DATA/opsi-apache.directorystudio.ini b/CLIENT_DATA/opsi-apache.directorystudio.ini
index 978f02e..3bcccd3 100644
--- a/CLIENT_DATA/opsi-apache.directorystudio.ini
+++ b/CLIENT_DATA/opsi-apache.directorystudio.ini
@@ -1,10 +1,6 @@
 [X86]
-MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
-MsiId32={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
 
 [X86_64]
-MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
-MsiId64={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
 
 [COMMON]
 PN=name