From fd986f469575e322d0dd97db61b840a0370f426f Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 6 Aug 2012 20:09:55 +0000
Subject: [PATCH] Adjust for final release

---
 msi/WiX/Compile.bat               | 4 ++--
 msi/WiX/ShibbolethSP-main-x64.wxs | 4 ++--
 msi/WiX/ShibbolethSP-main-x86.wxs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
index 32c84c2..8f2ee75 100644
--- a/msi/WiX/Compile.bat
+++ b/msi/WiX/Compile.bat
@@ -26,8 +26,8 @@ candle ShibbolethSP-install-dlg.wxs
 
 wixcop -indent:2 ShibbolethSP-main-x64.wxs
 candle ShibbolethSP-main-x64.wxs
-light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0rc1-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
 
 wixcop -indent:2 ShibbolethSP-main-x86.wxs
 candle ShibbolethSP-main-x86.wxs
-light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0rc1-win32.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
+light -sw1055 -sice:ICE82 -o shibboleth-sp-2.5.0-win32.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 53badc3..89a8af3 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -22,11 +22,11 @@
   <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) RC 1' Compressed='yes'
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion)' Compressed='yes'
            Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
-           AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallExecute' />
+           MigrateFeatures='yes' Schedule='afterInstallExecute' />
 
     <PropertyRef Id='SHIB_OLDVERSION_64'/>
     <PropertyRef Id='SHIB_OLDVERSION'/>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index d531086..3f8d422 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -22,11 +22,11 @@
   <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' 
            Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) RC 1' Compressed='yes'
+    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion)' Compressed='yes'
            Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
-           AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallExecute' />
+           MigrateFeatures='yes' Schedule='afterInstallExecute' />
 
     <PropertyRef Id='SHIB_OLDVERSION'/>
 
-- 
2.1.4