Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.4 into lp:ubuntu/maverick/ubuntu-sso-client

[Natalia Bidart]

  * New upstream release (SRUs):
  [ Alejandro J. Cura <email address hidden> ]
    * Replace twisted gtk reactor with the standard gtk mainloop. (LP: #655327).
  [ Alejandro J. Cura <email address hidden> ]
    * Call the dbus mainloop thread init (fixes LP: #656545).

  * Adding .bzr-builddeb/default.conf as per mvo request.
  * Adding dpkg (>= 1.15.7.2) as Pre-Depends (fixes LP: #658768).
  * Adding gnome-keyring as dep since python-gnomekeyring doesn't install it.

[Natalia Bidart (nataliabidart)]

Note: I couldn't branch maverick-proposed (nor propose merge against it) since the branch does not exist (yet?).

[lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.4]

21. By Natalia Bidart on 2010-10-12

Updating changelog with debian/control fixes.

[Ken VanDine (ken-vandine)]

Uploaded to maverick-proposed, in the unapproved queue.

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2010-10-12 13:39:44 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split=True

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-10-01 14:57:22 +0000
+++ PKG-INFO	2010-10-12 13:39:44 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 1.0.3
+Version: 1.0.4
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart

=== modified file 'bin/ubuntu-sso-login'
--- bin/ubuntu-sso-login	2010-10-01 14:57:22 +0000
+++ bin/ubuntu-sso-login	2010-10-12 13:39:44 +0000
@@ -42,6 +42,7 @@
 import signal
 import sys
 
+import dbus.mainloop.glib
 import dbus.service
 import gtk
 
@@ -57,21 +58,21 @@
 
 
 logger = setup_logging("ubuntu-sso-login")
+dbus.mainloop.glib.threads_init()
 gtk.gdk.threads_init()
 DBusGMainLoop(set_as_default=True)
 
 
 def sighup_handler(*a, **kw):
-    """Stop the service.
-
-    This is not thread safe, see the link below for info:
-    www.listware.net/201004/gtk-devel-list/115067-unix-signals-in-glib.html
-    """
-    from twisted.internet import reactor
-    # Module 'twisted.internet.reactor' has no 'stop' member
-    # pylint: disable=E1101
+    """Stop the service."""
+    # This handler may be called in any thread, so is not thread safe.
+    # See the link below for info:
+    # www.listware.net/201004/gtk-devel-list/115067-unix-signals-in-glib.html
+    #
+    # gtk.main_quit and the logger methods are safe to be called from any thread.
+    # Just don't call other random stuff here.
     logger.info("Stoping Ubuntu SSO login manager since SIGHUP was received.")
-    reactor.stop()
+    gtk.main_quit()
 
 
 if __name__ == "__main__":
@@ -83,10 +84,6 @@
         logger.error("Ubuntu SSO login manager already running, quitting.")
         sys.exit(0)
 
-    logger.debug("Installing the Twisted gtk2reactor.")
-    from twisted.internet import gtk2reactor
-    gtk2reactor.install()
-
     logger.debug("Hooking up SIGHUP with handler %r.", sighup_handler)
     signal.signal(signal.SIGHUP, sighup_handler)
 
@@ -97,7 +94,4 @@
                                         bus=dbus.SessionBus()),
                    object_path=DBUS_CRED_PATH)
 
-    from twisted.internet import reactor
-    # Module 'twisted.internet.reactor' has no 'run' member
-    # pylint: disable=E1101
-    reactor.run()
+    gtk.main()

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-01 15:35:43 +0000
+++ debian/changelog	2010-10-12 13:39:44 +0000
@@ -1,3 +1,21 @@
+ubuntu-sso-client (1.0.4-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ Alejandro J. Cura <[e-mail]> ]
+    * Replace twisted gtk reactor with the standard gtk mainloop. (LP: #655327).
+
+  [ Alejandro J. Cura <[e-mail]> ]
+    * Call the dbus mainloop thread init (fixes LP: #656545).
+
+  * Adding .bzr-builddeb/default.conf as per Michael Vog (mvo) request.
+
+  * Adding dpkg (>= 1.15.7.2) as Pre-Depends (fixes LP: #658768).
+
+  * Adding gnome-keyring as dep since python-gnomekeyring doesn't install it.
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Tue, 12 Oct 2010 10:07:55 -0300
+
 ubuntu-sso-client (1.0.3-0ubuntu1) maverick; urgency=low
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2010-09-13 15:02:42 +0000
+++ debian/control	2010-10-12 13:39:44 +0000
@@ -13,9 +13,10 @@
 Package: ubuntu-sso-client
 Architecture: all
 XB-Python-Version: ${python:Versions}
+Pre-Depends: dpkg (>=1.15.7.2),
 Depends: ${misc:Depends},
  ${python:Depends},
- dpkg (>=1.15.7.2),
+ gnome-keyring,
  python-dbus,
  python-gnomekeyring,
  python-gtk2,

=== modified file 'setup.py'
--- setup.py	2010-10-01 14:57:22 +0000
+++ setup.py	2010-10-12 13:39:44 +0000
@@ -86,7 +86,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='1.0.3',
+    version='1.0.4',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',