[cpp-sp COMMIT] in /branches/REL_2: msbuild/ msi/WiX/Patch-x64.wxs

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 30 15:20:08 2013
New Revision: 3859

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3859&view=rev
Log:
Remove empty dir

Modified:
    branches/REL_2/msbuild/
    branches/REL_2/msi/WiX/Patch-x64.wxs

Modified: branches/REL_2/msi/WiX/Patch-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/Patch-x64.wxs?rev=3859&r1=3858&r2=3859&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/Patch-x64.wxs (original)
+++ branches/REL_2/msi/WiX/Patch-x64.wxs Thu May 30 15:20:08 2013
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <PatchCreation
-        Id="{5BCA9365-B963-4B1A-BD7A-C1558BDE79EE}"
+        Id="{B49B7607-87C9-4E2A-A3F2-13CED629B37A}"
         CleanWorkingFolder="yes"
         OutputPath="patch.pcp"
         WholeFilesOnly="yes"
@@ -11,7 +11,7 @@
  
         <PatchInformation 
             Description="Security Patch for Shibboleth SP 2.5.1 (x64)"
-            Comments="OpenSAML version to 2.5.2" 
+            Comments="Provides OpenSAML 2.5.2, curl 7.29.0, OpenSSL 1.0.1e"
             ShortNames="no" 
             Languages="1033" 
             Compressed="yes" 
@@ -29,8 +29,8 @@
             ManufacturerName="Shibboleth Consortium"
             TargetProductName="Shibboleth SP"
             MoreInfoURL="http://www.shibboleth.net/"
-            Classification="Update"
-            DisplayName="Security Patch for Shibboleth SP 2.5.1 10-Jan-2013"/>
+            Classification="Security Rollup"
+            DisplayName="Security Patch for Shibboleth SP 2.5.1 28-Feb-2013"/>
  
     <!-- Note:
          That SequenceStart must be greater than the last
@@ -42,8 +42,8 @@
             MediaSrcProp="Sample" 
             Name="Sample"
             SequenceStart="5000">
-            <UpgradeImage SourceFile="C:\foo\PatchSp\x64\new\new.msi" Id="Upgrade">
-                <TargetImage SourceFile="C:\foo\PatchSp\x64\old\old.msi" Order="2"      
+            <UpgradeImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Original-2.5.1-x64\shibboleth-sp-2.5.1-win64.msi" Id="Upgrade">
+                <TargetImage SourceFile="C:\Users\Administrator\Shibboleth\AdminInstalls\Patched-2.5.1-x64\shibboleth-sp-2.5.1-win64.msi" Order="2"      
                     Id="Target" IgnoreMissingFiles="no" />
             </UpgradeImage>
         </Family>