Merge lp:~alecu/ubuntuone-windows-installer/include-valicert into lp:ubuntuone-windows-installer

[Alejandro J. Cura]

- Include the ValiCert certificate in the packaging (LP: #882062).

This branch depends on the following branches:

 * lp:~alecu/ubuntuone-storage-protocol/include-valicert
 * lp:~alecu/ubuntuone-client/validate-ssl-cert

[Roberto Alsina (ralsina)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-06-01 04:08:03 +0000
+++ scripts/setup.py	2012-06-12 17:12:21 +0000
@@ -267,6 +267,10 @@
             "ubuntuone-storage-protocol", "data",
             "UbuntuOne-Go_Daddy_Class_2_CA.pem"),
             os.path.join("data", "UbuntuOne-Go_Daddy_Class_2_CA.pem"))
+        shutil.copyfile(os.path.join("sources",
+            "ubuntuone-storage-protocol", "data",
+            "ValiCert_Class_2_VA.pem"),
+            os.path.join("data", "ValiCert_Class_2_VA.pem"))
 
         # Copy syncdaemon config data
         shutil.copyfile(os.path.join("sources",

=== modified file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	2012-05-10 17:47:47 +0000
+++ scripts/ubuntuone.xml	2012-06-12 17:12:21 +0000
@@ -296,6 +296,10 @@
             <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
             <origin>${installdir}\data\UbuntuOne-Go_Daddy_Class_2_CA.pem</origin>
         </copyFile>
+        <copyFile>
+            <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
+            <origin>${installdir}\data\ValiCert_Class_2_VA.pem</origin>
+        </copyFile>
         <deleteFile>
             <path>c:\install.exe</path>
         </deleteFile>