From scm-commit at wald.intevation.org  Sat Dec 18 12:04:14 2010
From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org)
Date: Sat, 18 Dec 2010 12:04:14 +0100 (CET)
Subject: [Openpgpmdrv-commits] r13 - trunk/makemsi
Message-ID: <20101218110414.47ABF865F4ED@pyrosoma.intevation.org>

Author: vletoux
Date: 2010-12-18 12:04:13 +0100 (Sat, 18 Dec 2010)
New Revision: 13

Modified:
   trunk/makemsi/openpgpmdrv32release.wxs
   trunk/makemsi/openpgpmdrv64release.wxs
Log:
fix uninstall issue if the process is launched from the msi file

Modified: trunk/makemsi/openpgpmdrv32release.wxs
===================================================================
--- trunk/makemsi/openpgpmdrv32release.wxs	2010-03-31 08:58:46 UTC (rev 12)
+++ trunk/makemsi/openpgpmdrv32release.wxs	2010-12-18 11:04:13 UTC (rev 13)
@@ -2,15 +2,15 @@
 <?include $(sys.SOURCEFILEDIR)openpgpmdrv-include.wxs ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difx='http://schemas.microsoft.com/wix/DifxAppExtension'>
-  <Product UpgradeCode="$(var.UpgradeCode)" Name="OpenPGP Smartcard minidriver (x86)" Id="*" Version="$(var.Version)" Manufacturer="OpenPGP" Language="1033">
-    <Package Id="*" Manufacturer="Fedict" InstallerVersion="200" Platform="x86" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+  <Product UpgradeCode="$(var.UpgradeCode)" Name="OpenPGP Smartcard minidriver (x86)" Id="*" Version="$(var.Version)" Manufacturer="MySmartLogon" Language="1033">
+    <Package Id="*" Manufacturer="MySmartLogon" InstallerVersion="200" Platform="x86" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
 	<!-- do not edit the rtf file with word! The installer will be unable to read the license -->
 	<WixVariable Id="WixUILicenseRtf" Value="Resources\gnu-lgpl.rtf" />
 
 	<Upgrade Id='$(var.UpgradeCode)'>
       <UpgradeVersion OnlyDetect='no' Property='OLDERFOUND'
-        Minimum='0.0.0.1' IncludeMinimum='yes'
+        Minimum='0.0.0.0' IncludeMinimum='yes'
         Maximum='$(var.Version)' IncludeMaximum='no' />
       <UpgradeVersion OnlyDetect='yes' Property='SELFFOUND'
         Minimum='$(var.Version)' IncludeMinimum='yes'

Modified: trunk/makemsi/openpgpmdrv64release.wxs
===================================================================
--- trunk/makemsi/openpgpmdrv64release.wxs	2010-03-31 08:58:46 UTC (rev 12)
+++ trunk/makemsi/openpgpmdrv64release.wxs	2010-12-18 11:04:13 UTC (rev 13)
@@ -2,15 +2,15 @@
 <?include $(sys.SOURCEFILEDIR)openpgpmdrv-include.wxs ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:difx='http://schemas.microsoft.com/wix/DifxAppExtension'>
-  <Product UpgradeCode="$(var.UpgradeCode)" Name="OpenPGP Smartcard minidriver (x64)" Id="*" Version="$(var.Version)" Manufacturer="OpenPGP" Language="1033">
-    <Package Id="*" Manufacturer="Fedict" InstallerVersion="200" Platform="x64" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
+  <Product UpgradeCode="$(var.UpgradeCode)" Name="OpenPGP Smartcard minidriver (x64)" Id="*" Version="$(var.Version)" Manufacturer="MySmartLogon" Language="1033">
+    <Package Id="*" Manufacturer="MySmartLogon" InstallerVersion="200" Platform="x64" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
 
 	<!-- do not edit the rtf file with word! The installer will be unable to read the license -->
 	<WixVariable Id="WixUILicenseRtf" Value="Resources\gnu-lgpl.rtf" />
 
 	<Upgrade Id='$(var.UpgradeCode)'>
       <UpgradeVersion OnlyDetect='no' Property='OLDERFOUND'
-        Minimum='0.0.0.1' IncludeMinimum='yes'
+        Minimum='0.0.0.0' IncludeMinimum='yes'
         Maximum='$(var.Version)' IncludeMaximum='no' />
       <UpgradeVersion OnlyDetect='yes' Property='SELFFOUND'
         Minimum='$(var.Version)' IncludeMinimum='yes'