From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 30 May 2013 19:20:08 +0000 (+0000)
Subject: Remove empty dir
X-Git-Tag: 2.5.2~9
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=4f5ab4e8921f732c3a791dc07f9c39a5634b8d4f

Remove empty dir
---

diff --git a/msi/WiX/Patch-x64.wxs b/msi/WiX/Patch-x64.wxs
index 49f3a4e..02f17e2 100644
--- a/msi/WiX/Patch-x64.wxs
+++ b/msi/WiX/Patch-x64.wxs
@@ -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>