Merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.8.1 into lp:ubuntu/natty/ubuntuone-control-panel

[Natalia Bidart]

  * New upstream release:
    [ Natalia B. Bidart <email address hidden> ]
      - Added support to install u1cp-gtk in the messaging menu (LP: #708003).

  * debian/ubuntuone-control-panel-gtk.install
    - Installing file to add ubuntuone-control-panel to messaging menu.

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-01-25 19:08:59 +0000
+++ PKG-INFO	2011-01-28 01:31:16 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 0.8.0
+Version: 0.8.1
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart
@@ -8,26 +8,4 @@
 License: GPL v3
 Description: Application to manage a Ubuntu One account. Provides aDBus service to query/modify all the Ubuntu One bits.
 Platform: UNKNOWN
-Requires: DistUtilsExtra.auto
-Requires: apt
-Requires: aptdaemon
-Requires: dbus
-Requires: desktopcouch.application.replication_services
-Requires: gi.repository
-Requires: gobject
-Requires: gtk
-Requires: mocker
-Requires: oauth
-Requires: pango
-Requires: simplejson
-Requires: twisted.application
-Requires: twisted.internet
-Requires: twisted.python.failure
-Requires: twisted.web
-Requires: ubuntu_sso
-Requires: ubuntuone.clientdefs
-Requires: ubuntuone.devtools.handlers
-Requires: ubuntuone.devtools.testcase
-Requires: ubuntuone.logger
-Requires: ubuntuone.platform.linux
 Provides: ubuntuone.controlpanel

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-25 19:33:21 +0000
+++ debian/changelog	2011-01-28 01:31:16 +0000
@@ -1,3 +1,14 @@
+ubuntuone-control-panel (0.8.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    [ Natalia B. Bidart <[e-mail]> ]
+      - Added support to install u1cp-gtk in the messaging menu (LP: #708003).
+
+  * debian/ubuntuone-control-panel-gtk.install
+    - Installing file to add ubuntuone-control-panel to messaging menu.
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Thu, 27 Jan 2011 19:11:21 -0300
+
 ubuntuone-control-panel (0.8.0-0ubuntu1) natty; urgency=low
 
   * New upstream release:

=== modified file 'debian/ubuntuone-control-panel-gtk.install'
--- debian/ubuntuone-control-panel-gtk.install	2011-01-07 20:12:55 +0000
+++ debian/ubuntuone-control-panel-gtk.install	2011-01-28 01:31:16 +0000
@@ -1,4 +1,5 @@
 debian/tmp/usr/bin/ubuntuone-control-panel-gtk
+debian/tmp/usr/share/indicators/messages/applications/ubuntuone-control-panel
 debian/tmp/usr/share/applications/ubuntuone-control-panel-gtk.desktop
 debian/tmp/usr/share/ubuntuone-control-panel/*.ui
 debian/tmp/usr/share/ubuntuone-control-panel/*.png

=== modified file 'setup.py'
--- setup.py	2011-01-25 19:08:59 +0000
+++ setup.py	2011-01-28 01:31:16 +0000
@@ -32,15 +32,16 @@
 
 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, CONSTANTS, POT_FILE, 'MANIFEST']
+CLEANFILES = [SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE, 'MANIFEST']
 
 
 def replace_prefix(prefix):
     """Replace every '@prefix@' with prefix within 'filename' content."""
     # replace .service file, DATA_DIR constant
-    for filename in (SERVICE_FILE, CONSTANTS):
+    for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
         with open(filename + '.in') as in_file:
             content = in_file.read()
             with open(filename, 'w') as out_file:
@@ -75,7 +76,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='0.8.0',
+    version='0.8.1',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
@@ -88,6 +89,7 @@
         ('lib/ubuntuone-control-panel',
          ['bin/ubuntuone-control-panel-backend']),
         ('share/dbus-1/services/', [SERVICE_FILE]),
+        ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
     ],
     cmdclass={
         'install': ControlPanelInstall,

=== added file 'ubuntuone-control-panel.in'
--- ubuntuone-control-panel.in	1970-01-01 00:00:00 +0000
+++ ubuntuone-control-panel.in	2011-01-28 01:31:16 +0000
@@ -0,0 +1,1 @@
+@prefix@/share/applications/ubuntuone-control-panel-gtk.desktop