[gimp] Installer: fixes for upgrading from 2.8

[Jernej Simončič <jernejs src gnome org>]

commit 68b49388301a4a2e6dffd2f4d4e84639f085cbc1
Author: Jernej Simončič <jernej|s-cccp eternallybored org>
Date:   Wed May 2 14:04:13 2018 +0200

    Installer: fixes for upgrading from 2.8

 build/windows/installer/32on64.isi   |    4 ++--
 build/windows/installer/files.isi    |   18 +++++++++---------
 build/windows/installer/gimp3264.iss |    7 +++++++
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/build/windows/installer/32on64.isi b/build/windows/installer/32on64.isi
index 1c39ef0..eb70a76 100644
--- a/build/windows/installer/32on64.isi
+++ b/build/windows/installer/32on64.isi
@@ -19,11 +19,11 @@
 #sub DoActualWork
        #if Copy(FileLine,Len(FileLine),1)=="\"
                //include whole directory
-Source: "{#SRC_DIR}\{#FileLine}*"; DestDir: "{app}\32\{#Copy(FileLine,1,Len(FileLine)-1)}"; Components: 
gimp32on64; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#SRC_DIR}\{#FileLine}*"; DestDir: "{app}\32\{#Copy(FileLine,1,Len(FileLine)-1)}"; Components: 
gimp32on64; Flags: recursesubdirs restartreplace replacesameversion uninsrestartdelete
        #else
                //include files from a certain directory
                #define OutputDir Copy(FileLine,1,RPos("\",FileLine)-1)
-Source: "{#SRC_DIR}\{#FileLine}"; DestDir: "{app}\32\{#OutputDir}"; Components: gimp32on64; Flags: 
restartreplace comparetimestamp uninsrestartdelete
+Source: "{#SRC_DIR}\{#FileLine}"; DestDir: "{app}\32\{#OutputDir}"; Components: gimp32on64; Flags: 
restartreplace replacesameversion uninsrestartdelete
        #endif
 #endsub
 
diff --git a/build/windows/installer/files.isi b/build/windows/installer/files.isi
index d224320..2957892 100644
--- a/build/windows/installer/files.isi
+++ b/build/windows/installer/files.isi
@@ -12,19 +12,19 @@
        #error "Unknown PLATFORM:" + PLATFORM
 #endif
 
-Source: "{#GIMP_DIR}\{#DIR}\*.dll"; DestDir: "{app}"; Components: gimp{#PLATFORM}; Flags: recursesubdirs 
restartreplace comparetimestamp uninsrestartdelete
-Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: 
"\lib\gimp\2.0\plug-ins\twain.exe,\lib\gimp\2.0\plug-ins\file-ps.exe,\lib\gimp\2.0\plug-ins\file-mng.exe,\bin\gimp.exe,\bin\gimp-console.exe";
 Components: gimp{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\*.dll"; DestDir: "{app}"; Components: gimp{#PLATFORM}; Flags: recursesubdirs 
restartreplace replacesameversion uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\*.exe"; DestDir: "{app}"; Excludes: 
"\lib\gimp\2.0\plug-ins\twain.exe,\lib\gimp\2.0\plug-ins\file-ps.exe,\lib\gimp\2.0\plug-ins\file-mng.exe,\bin\gimp.exe,\bin\gimp-console.exe";
 Components: gimp{#PLATFORM}; Flags: recursesubdirs restartreplace replacesameversion uninsrestartdelete
 
-Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-ps.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gs and gimp{#PLATFORM}; Flags: restartreplace comparetimestamp uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-ps.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gs and gimp{#PLATFORM}; Flags: restartreplace replacesameversion uninsrestartdelete
 
-Source: "{#DEPS_DIR}\{#DDIR}\*.dll"; DestDir: "{app}"; Excludes: "\bin\libgs*.dll"; Components: 
deps{#PLATFORM}; Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
-Source: "{#DEPS_DIR}\{#DDIR}\bin\libgs*.dll"; DestDir: "{app}\bin"; Components: gs and deps{#PLATFORM}; 
Flags: recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\*.dll"; DestDir: "{app}"; Excludes: "\bin\libgs*.dll"; Components: 
deps{#PLATFORM}; Flags: recursesubdirs restartreplace replacesameversion uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\bin\libgs*.dll"; DestDir: "{app}\bin"; Components: gs and deps{#PLATFORM}; 
Flags: recursesubdirs restartreplace replacesameversion uninsrestartdelete
 
-Source: "{#DEPS_DIR}\{#DDIR}\bin\gspawn-win*.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\bin\gspawn-win*.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace replacesameversion uninsrestartdelete
 Source: "{#DEPS_DIR}\{#DDIR}\bin\bzip2.exe"; DestDir: "{app}\bin"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace uninsrestartdelete
-Source: "{#DEPS_DIR}\{#DDIR}\lib\*.dll"; DestDir: "{app}\lib"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace comparetimestamp uninsrestartdelete
-Source: "{#DEPS_DIR}\{#DDIR}\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: 
"{app}\lib\gdk-pixbuf-2.0\2.10.0\"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace 
comparetimestamp uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\lib\*.dll"; DestDir: "{app}\lib"; Components: deps{#PLATFORM}; Flags: 
recursesubdirs restartreplace replacesameversion uninsrestartdelete
+Source: "{#DEPS_DIR}\{#DDIR}\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache"; DestDir: 
"{app}\lib\gdk-pixbuf-2.0\2.10.0\"; Components: deps{#PLATFORM}; Flags: recursesubdirs restartreplace 
replacesameversion uninsrestartdelete
 
 #if PLATFORM==64
-Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-mng.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gimp{#PLATFORM}; Flags: restartreplace comparetimestamp uninsrestartdelete
+Source: "{#GIMP_DIR}\{#DIR}\lib\gimp\2.0\plug-ins\file-mng.exe"; DestDir: "{app}\lib\gimp\2.0\plug-ins"; 
Components: gimp{#PLATFORM}; Flags: restartreplace replacesameversion uninsrestartdelete
 #endif
diff --git a/build/windows/installer/gimp3264.iss b/build/windows/installer/gimp3264.iss
index 544eb46..6c9cb07 100755
--- a/build/windows/installer/gimp3264.iss
+++ b/build/windows/installer/gimp3264.iss
@@ -325,6 +325,13 @@ Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\gee.exe"
 Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\gee-zoom.exe"
 ;old Python
 Type: filesandordirs; Name: "{app}\Python\*"
+;remove incompatible version shipped with 2.8
+Type: files; Name: "{app}\bin\zlib1.dll"
+Type: files; Name: "{app}\32\bin\zlib1.dll"
+;obsolete plugins from gimp 2.8
+Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\metadata.exe"
+Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\file-psd-save.exe"
+Type: files; Name: "{app}\lib\gimp\2.0\plug-ins\file-psd-load.exe"
 
 [UninstallDelete]
 Type: files; Name: "{app}\uninst\uninst.inf"