Update to 2.8.5

And remove cleanup steps for older TightVNC and RealVNC

packages/tightvnc.xml

@@ -2,31 +2,19 @@
 <packages>
     <package id="tightvnc" 
              name="Serveur VNC TightVNC"
-             revision="14"
+             revision="15"
              priority="10" 
              reboot="false">
  
-        <variable name="PKG_VERSION" value="2.7.10" />
+        <variable name="PKG_VERSION" value="2.8.5" />
 
-        <variable architecture="x86" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup-32bit.msi" />
-        <variable architecture="x64" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup-64bit.msi" />
+        <variable architecture="x86" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-gpl-setup-32bit.msi" />
+        <variable architecture="x64" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-gpl-setup-64bit.msi" />
         <variable name="REG_PATH" value="%SETTINGS%\tightvnc\tightvnc.reg" />
         <variable name="INSTALL_PATH" value="%PROGRAMFILES%\TightVNC" />
 
         <check type="uninstall" condition="versiongreaterorequal" path="TightVNC" value="%PKG_VERSION%" />
 
-        <!-- Remove RealVNC if installed -->
-        <install cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" /SP- /VERYSILENT /NORESTART' />
-        <!-- Remove 2.0.X TightVNC if needed -->
-        <install architecture='x86' cmd='"%ProgramFiles%\TightVNC\uninstall.exe" /S' >
-            <exit code="any" />
-        </install>
-        <install architecture='x64' cmd='"%ProgramFiles(x86)%\TightVNC\uninstall.exe" /S' >
-            <exit code="any" />
-        </install>
-        <!-- Wait a few seconds for the uninstall to run as it returns immediatly -->
-        <install cmd='%COMSPEC% /C ping -n 5 127.0.0.1 1>NUL 2>NUL' />
-
         <!-- Install TightVNC -->
         <install cmd='msiexec /qn /norestart /i "%MSI%"' />
         <!-- Install the TightVNC Server as a service -->
@@ -44,15 +32,6 @@
         <!-- Restart the TightVNC Server -->
         <install cmd='"%INSTALL_PATH%\tvnserver" -start -silent' />
 
-        <!-- Remove RealVNC if installed -->
-        <upgrade cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" /SP- /VERYSILENT /NORESTART' />
-        <!-- Remove 2.0.X TightVNC if needed -->
-        <upgrade architecture='x86' cmd='"%ProgramFiles%\TightVNC\uninstall.exe" /S' >
-            <exit code="any" />
-        </upgrade>
-        <upgrade architecture='x64' cmd='"%ProgramFiles(x86)%\TightVNC\uninstall.exe" /S' >
-            <exit code="any" />
-        </upgrade>
         <!-- Wait a few seconds for the uninstall to run as it returns immediatly -->
         <upgrade cmd='%COMSPEC% /C ping -n 5 127.0.0.1 1>NUL 2>NUL' />
         <upgrade cmd='msiexec /qn /norestart /i "%MSI%"' />