Merge lp:~mikemc/ubuntuone-windows-installer/release-4-0-with-updater-for-real into lp:ubuntuone-windows-installer

[Mike McCracken]

- Darwin: Bump version to 4.0 and add updater as sub-app.

- Darwin: Bump version to 4.0 and add updater as sub-app.

[Brian Curtin (brian.curtin)]

Looks ok to me.

review: Approve

[lp:~mikemc/ubuntuone-windows-installer/release-4-0-with-updater-for-real]

155. By Mike McCracken on 2012-12-10

No changes. commit is to poke launchpad.

[dobey (dobey)]

review: Approve

=== modified file 'scripts/data/macapp_template.plist'
--- scripts/data/macapp_template.plist	2012-11-20 22:37:34 +0000
+++ scripts/data/macapp_template.plist	2012-12-10 18:49:20 +0000
@@ -9,7 +9,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0 beta 2</string>
+	<string>4.0</string>
 	<key>CFBundleVersion</key>
 	<string>4.0</string>
 </dict>

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-11-21 00:10:36 +0000
+++ scripts/setup-mac.py	2012-12-10 18:49:20 +0000
@@ -68,6 +68,7 @@
              'ubuntuone-syncdaemon': 'UbuntuOne Syncdaemon',
              'ubuntuone-control-panel-qt': 'Ubuntu One',
              'ubuntuone-proxy-tunnel': 'UbuntuOne Proxy Tunnel',
+             'ubuntuone-updater': 'UbuntuOne Updater',
              'u1sdtool': 'U1SDTool'
              }
 
@@ -658,6 +659,10 @@
                                  "com.ubuntu.one.u1sdtool",
                                  "u1sdtool")
 
+    updater_app_path = do_setup(True,
+                                "com.ubuntu.one.updater",
+                                 "ubuntuone-updater")
+
     control_panel_app_path = do_setup(False,
                                       "com.ubuntu.one.controlpanel",
                                       "ubuntuone-control-panel-qt",