Merge lp:~mikemc/ubuntuone-windows-installer/space-and-version-bump into lp:ubuntuone-windows-installer

[Mike McCracken]

- Add space to main app name and bump version number for a beta 2 release (testing)

- Add space to main app name and bump version number for a beta 2 release (testing)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'scripts/codesign-darwin-verify.sh'
--- scripts/codesign-darwin-verify.sh	2012-09-11 06:45:35 +0000
+++ scripts/codesign-darwin-verify.sh	2012-11-21 00:08:20 +0000
@@ -5,20 +5,20 @@
 set -x 
 set -e
 
-helper=UbuntuOne.app/Contents/Library/LaunchServices/com.ubuntu.one.fsevents
+helper=Ubuntu\ One.app/Contents/Library/LaunchServices/com.ubuntu.one.fsevents
 
 echo "\nDisplaying Contents:"
-$codesign -d -vvvv UbuntuOne.app
+$codesign -d -vvvv Ubuntu\ One.app
 
 echo "\nVerifying Main App:"
-$codesign -v -v UbuntuOne.app
+$codesign -v -v Ubuntu\ One.app
 
 echo "\nVerifying Daemon:"
 $codesign -v -v $helper
 
 echo "\nDouble-check: the SMPrivilegedExecutables entry should show the right ID and CN"
-defaults read "`pwd`/UbuntuOne.app/Contents/Info.plist" SMPrivilegedExecutables 
-defaults read "`pwd`/UbuntuOne.app/Contents/Info.plist" SMPrivilegedExecutables | perl -nle 'print "identifier $1 and certificate leaf[subject.CN] = \"$3\"" if /\"(.*)\" = \"identifier (.*) and certificate leaf\[subject.CN\] = \\\\\"(.*)\\\\\"/;' > tmp.req
+defaults read "`pwd`/Ubuntu\ One.app/Contents/Info.plist" SMPrivilegedExecutables 
+defaults read "`pwd`/Ubuntu\ One.app/Contents/Info.plist" SMPrivilegedExecutables | perl -nle 'print "identifier $1 and certificate leaf[subject.CN] = \"$3\"" if /\"(.*)\" = \"identifier (.*) and certificate leaf\[subject.CN\] = \\\\\"(.*)\\\\\"/;' > tmp.req
 
 echo "\nChecking that the helper satisfies the app SMPrivilegedExecutables requirement"
 $codesign -v -v -R tmp.req $helper
@@ -27,7 +27,7 @@
 echo "\nChecking that the app satisfies the helper's SMAuthorizedClients requirement"
 otool -s __TEXT __info_plist $helper | grep "^[0-9a-f]\{8,16\}" | xxd -r - - > tmp.plist
 perl -nle 'print "identifier $1 and certificate leaf[subject.CN] = \"$2\"" if /identifier (.*) and certificate leaf\[subject.CN\] = "(.*)"/;' tmp.plist > tmp.req 
-$codesign -v -v -R tmp.req UbuntuOne.app
+$codesign -v -v -R tmp.req Ubuntu\ One.app
 rm tmp.plist tmp.req
 
 echo Done.

=== modified file 'scripts/codesign-darwin.sh'
--- scripts/codesign-darwin.sh	2012-09-11 06:45:35 +0000
+++ scripts/codesign-darwin.sh	2012-11-21 00:08:20 +0000
@@ -7,10 +7,10 @@
 
 $codesign -f -s "$@" com.ubuntu.one.fsevents
 
-mkdir -p UbuntuOne.app/Contents/Library/LaunchServices
-
-cp com.ubuntu.one.fsevents UbuntuOne.app/Contents/Library/LaunchServices/
-
-$codesign -f -s "$@" UbuntuOne.app
+mkdir -p "Ubuntu One.app/Contents/Library/LaunchServices"
+
+cp com.ubuntu.one.fsevents "Ubuntu One.app/Contents/Library/LaunchServices/"
+
+$codesign -f -s "$@" "Ubuntu One.app"
 
 echo Done.

=== modified file 'scripts/data/macapp_template.plist'
--- scripts/data/macapp_template.plist	2012-10-09 20:26:38 +0000
+++ scripts/data/macapp_template.plist	2012-11-21 00:08:20 +0000
@@ -9,8 +9,8 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.99.90 beta 1</string>
+	<string>4.0 beta 2</string>
 	<key>CFBundleVersion</key>
-	<string>3.99.90</string>
+	<string>4.0</string>
 </dict>
 </plist>

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-10-09 20:28:51 +0000
+++ scripts/setup-mac.py	2012-11-21 00:08:20 +0000
@@ -64,7 +64,7 @@
              'ubuntu-sso-ssl-certificate-qt': 'Ubuntu SSO SSL Certificate',
              'ubuntu-sso-proxy-creds-qt': 'Ubuntu SSO Proxy Credentials',
              'ubuntuone-syncdaemon': 'UbuntuOne Syncdaemon',
-             'ubuntuone-control-panel-qt': 'UbuntuOne',
+             'ubuntuone-control-panel-qt': 'Ubuntu One',
              'ubuntuone-proxy-tunnel': 'UbuntuOne Proxy Tunnel',
              'u1sdtool': 'U1SDTool'
              }