update to 1.4.2 and provide native x64 build

packages/scribus.xml

@@ -2,19 +2,21 @@
 <packages>
     <package id="scribus"
              name="Scribus"
-             revision="5"
+             revision="6"
              reboot="false"
              priority="10">
 
-        <variable name="PKG_VERSION" value="1.4.1" />
+        <variable name="PKG_VERSION" value="1.4.2" />
         <variable architecture="x86" name="INSTALL_PATH" value="%PROGRAMFILES%\Scribus" />
         <variable architecture="x64" name="INSTALL_PATH" value="%PROGRAMFILES(x86)%\Scribus" />
+        <variable architecture="x86" name="EXE_PATH" value="%SOFTWARE%\scribus\scribus-%PKG_VERSION%-windows.exe" />
+        <variable architecture="x86" name="EXE_PATH" value="%SOFTWARE%\scribus\scribus-%PKG_VERSION%-windows-x64.exe" />
 
         <depends package-id="ghostscript" />
 
         <check type="uninstall" condition="exists" path="Scribus %PKG_VERSION%" />
  
-        <install cmd="%SOFTWARE%\scribus\scribus-%PKG_VERSION%-windows.exe /S /D=%INSTALL_PATH%" />
+        <install cmd='"%EXE_PATH%" /S /D=%INSTALL_PATH%' />
         <install cmd='%COMSPEC% /C del /f "%ALLUSERSPROFILE%\Bureau\Scribus %PKG_VERSION%.lnk"'>
              <exit code="0" />
              <exit code="1" />
@@ -29,11 +31,8 @@
 
         <downgrade include="upgrade" />
  
-        <remove cmd='"%INSTALL_PATH%\uninst.exe" /S' />
+        <remove cmd='"%INSTALL_PATH%\uninst.exe" /S _?=%INSTALL_PATH%'/>
-        <!-- Uninstall returns immediatly, so just wait a few seconds for it to remove before checking the status again
+        <!-- on x64, remove the 32bits version if present -->
-             Unfortunatly, WINDOWS has no sleep commands -->
+        <remove architecture="x64" cmd='%COMSPEC% /C if exist "%PROGRAMFILES(x86)%\Scribus\uninst.exe" "%PROGRAMFILES(x86)%\Scribus\uninst.exe" /S _?=%PROGRAMFILES(x86)%\Scribus\uninst.exe'/>
-        <remove cmd='%COMSPEC% /C ping -n 5 127.0.0.1 1>NUL 2>NUL' >
-            <exit code="any" />
-        </remove>
     </package>
 </packages>