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

[Natalia Bidart]

  * New upstream release:
  [ Natalia B. Bidart <email address hidden> ]
    * Workaround for LP: #467397 (when using turkish locale, decimal module
    import fails).
  [ Natalia B. Bidart <email address hidden> ]
    * Made entries name to be unicode to avoid a faulty capitalization when
    using turkish locale (LP: #652939).

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-09-22 16:47:09 +0000
+++ PKG-INFO	2010-10-01 15:21:06 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 1.0.2
+Version: 1.0.3
 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-09-08 19:25:02 +0000
+++ bin/ubuntu-sso-login	2010-10-01 15:21:06 +0000
@@ -21,11 +21,29 @@
 
 """Run the dbus service for UserManagement and ApplicationCredentials."""
 
-import gtk
+# import decimal even if we don't need it.
+import decimal
+# This is a workaround for LP: #467397. Some module in our depency chain sets
+# the locale and imports decimal, and that generates the following trace:
+# Traceback (most recent call last):
+#   File "/usr/lib/ubuntu-sso-client/ubuntu-sso-login", line 33
+#     from ubuntu_sso.main import SSOLogin, SSOCredentials
+#   File "/usr/lib/pymodules/python2.6/ubuntu_sso/main.py", line 42
+#     from lazr.restfulclient.resource import ServiceRoot
+#   File "/usr/lib/python2.6/dist-packages/lazr/restfulclient/resource.py",
+# line 34
+#     import simplejson
+#   File "/usr/lib/pymodules/python2.6/simplejson/__init__.py", line 109
+#     from decimal import Decimal
+#   File "/usr/lib/python2.6/decimal.py", line 3649, in <module>
+#     val = globals()[globalname]
+# KeyError: 'ROUND_CEiLiNG'
+
 import signal
 import sys
 
 import dbus.service
+import gtk
 
 from dbus.mainloop.glib import DBusGMainLoop
 

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-22 18:53:18 +0000
+++ debian/changelog	2010-10-01 15:21:06 +0000
@@ -1,3 +1,17 @@
+ubuntu-sso-client (1.0.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ Natalia B. Bidart <[e-mail]> ]
+    * Workaround for LP: #467397 (when using turkish locale, decimal module
+    import fails).
+
+  [ Natalia B. Bidart <[e-mail]> ]
+    * Made entries name to be unicode to avoid a faulty capitalization when
+    using turkish locale (LP: #652939).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Fri, 01 Oct 2010 12:00:54 -0300
+
 ubuntu-sso-client (1.0.2-0ubuntu1) maverick; urgency=low
 
   * New upstream release:

=== modified file 'setup.py'
--- setup.py	2010-09-22 16:47:09 +0000
+++ setup.py	2010-10-01 15:21:06 +0000
@@ -86,7 +86,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='1.0.2',
+    version='1.0.3',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-09-22 16:47:09 +0000
+++ ubuntu_sso/gui.py	2010-10-01 15:21:06 +0000
@@ -283,13 +283,12 @@
                 if 'label' in name:
                     self.labels.append(obj)
 
-        self.entries = ('name_entry', 'email1_entry', 'email2_entry',
-                        'password1_entry', 'password2_entry',
-                        'captcha_solution_entry', 'email_token_entry',
-                        'login_email_entry', 'login_password_entry',
-                        'reset_email_entry',
-                        'reset_code_entry',
-                        'reset_password1_entry', 'reset_password2_entry')
+        self.entries = (u'name_entry', u'email1_entry', u'email2_entry',
+                        u'password1_entry', u'password2_entry',
+                        u'captcha_solution_entry', u'email_token_entry',
+                        u'login_email_entry', u'login_password_entry',
+                        u'reset_email_entry', u'reset_code_entry',
+                        u'reset_password1_entry', u'reset_password2_entry')
 
         for name in self.entries:
             label = getattr(self, name.upper())