Merge lp:~dobey/ubuntuone-control-panel/no-msg-menu into lp:ubuntuone-control-panel

[dobey]

Remove messaging menu integration file.

[Mike McCracken (mikemc)]

Looks good.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/no-msg-menu into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    test_start_...

=== modified file 'setup.py'
--- setup.py	2012-05-24 18:59:58 +0000
+++ setup.py	2012-11-15 13:45:28 +0000
@@ -39,11 +39,10 @@
 
 POT_FILE = 'po/ubuntuone-control-panel.pot'
 SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
-MESSAGE_ENTRY = 'ubuntuone-control-panel'
 CONSTANTS = 'ubuntuone/controlpanel/constants.py'
 
 CLEANFILES = [
-    SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
+    SERVICE_FILE, CONSTANTS, POT_FILE,
     'MANIFEST']
 QT_UI_DIR = os.path.join('ubuntuone', 'controlpanel', 'gui', 'qt', 'ui')
 
@@ -51,7 +50,7 @@
 def replace_prefix(prefix):
     """Replace every '@prefix@' with prefix within 'filename' content."""
     # replace .service file, DATA_DIR constant
-    for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
+    for filename in (SERVICE_FILE, CONSTANTS):
         with open(filename + '.in') as in_file:
             content = in_file.read()
             with open(filename, 'w') as out_file:
@@ -217,7 +216,6 @@
         ('lib/ubuntuone-control-panel',
          ['bin/ubuntuone-control-panel-backend']),
         ('share/dbus-1/services/', [SERVICE_FILE]),
-        ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
         ('share/apport/package-hooks/',
          ['data/source_ubuntuone-control-panel.py']),
     ],

=== removed file 'ubuntuone-control-panel.in'
--- ubuntuone-control-panel.in	2011-09-16 14:37:20 +0000
+++ ubuntuone-control-panel.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-@prefix@/share/applications/ubuntuone-installer.desktop