Merge lp:~mikemc/ubuntuone-windows-installer/fix-1032292 into lp:ubuntuone-windows-installer

[Mike McCracken]

- Package ubuntuone/fseventsd.py correctly (LP: #1032292)

- Package ubuntuone/fseventsd.py correctly (LP: #1032292)

To test, run python setup.py prepare py2app and check that ubuntuone/fseventsd.py is in dist/ubuntuone-control-panel-qt/UbuntuOne.app/Contents/Resources/lib/python2.7/site-packages.zip

May I suggest:
% zipinfo -1 dist/ubuntuone-control-panel-qt/UbuntuOne.app/Contents/Resources/lib/python2.7/site-packages.zip | grep fseventsd

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The prerequisite https://code.launchpad.net/~mikemc/ubuntuone-windows-installer/fix-1032290 has not yet been merged into https://code.launchpad.net/~ubuntuone-control-tower/ubuntuone-windows-installer/trunk.

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-08-02 18:29:21 +0000
+++ scripts/setup-mac.py	2012-08-02 18:29:21 +0000
@@ -425,6 +425,17 @@
         with open(os.path.join("data", "logging.conf"), "wb") as logconf:
             logconf.write(data)
 
+        # Install fsevents_daemon client code: required because it is
+        # a subpackage of ubuntuone, which all needs to be in the same
+        # place for py2app to copy it
+        shutil.copyfile(os.path.join(self.source_dir,
+                                     "ubuntuone-fsevents-daemon",
+                                     "python",
+                                     "ubuntuone",
+                                     "fseventsd.py"),
+                        os.path.join(dest_dir, "ubuntuone",
+                                     "fseventsd.py"))
+
         # clear path_importer_cache to make sure that a following
         # py2app step can see the newly-copied
         # INSTALL_PATH/lib/site-packages/ubuntu_sso module without