[shibboleth-sp2] 86/89: Some x86 cleanup in merge modules

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit 9ebba5c3a16d03769f436e383e4c4cdaa33f5509
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Fri Jun 24 21:20:52 2016 -0400

    Some x86 cleanup in merge modules
---
 msi/WiX/MergeModules/OpenSAML-x86.wxs | 4 ++--
 msi/WiX/MergeModules/XmlSec-x86.wxs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index fb16f2f..be93d02 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -48,11 +48,11 @@
                 </Component>
                 <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>
                   <File KeyPath='yes' Checksum='yes'
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
                 <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>
                   <File KeyPath='yes' Checksum='yes'
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index 3e5d6dc..d499a3f 100644
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -18,7 +18,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>
-    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for Santuario (x64)'
+    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for Santuario (x86)'
              Comments='This module is built by the Shibboleth Consortium. Includes Several executable utilities.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
     <Directory Id='TARGETDIR' Name='SourceDir'>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git