[Debian-l10n-commits] r2020 - in /pootle/trunk/debian: changelog patches/import_old_config.patch patches/series

[nekral-guest at users.alioth.debian.org]

Author: nekral-guest
Date: Sun Dec  6 15:22:45 2009
New Revision: 2020

URL: http://svn.debian.org/wsvn/?sc=1&rev=2020
Log:
  * debian/patches/import_old_config.patch: Disabled. Bug fixed upstream and
    import of activation keys is not necessary.

Modified:
    pootle/trunk/debian/changelog
    pootle/trunk/debian/patches/import_old_config.patch
    pootle/trunk/debian/patches/series

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=2020&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Sun Dec  6 15:22:45 2009
@@ -1,6 +1,8 @@
 pootle (2.0.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/import_old_config.patch: Disabled. Bug fixed upstream and
+    import of activation keys is not necessary.
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sat, 21 Nov 2009 15:20:16 +0100
 

Modified: pootle/trunk/debian/patches/import_old_config.patch
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/import_old_config.patch?rev=2020&op=diff
==============================================================================
--- pootle/trunk/debian/patches/import_old_config.patch (original)
+++ pootle/trunk/debian/patches/import_old_config.patch Sun Dec  6 15:22:45 2009
@@ -1,14 +1,5 @@
 --- a/pootle/tools/import_old_prefs.py
 +++ b/pootle/tools/import_old_prefs.py
-@@ -195,8 +195,6 @@
-                 email          = _get_user_attribute(data, user_name, 'email'),
-                 is_active      = try_type(bool, _get_user_attribute(data, user_name, 'activated',
-                                                                     unicode_me=False, default=0)),
--                activationcode = _get_user_attribute(data, user_name, 'activationcode',
--                                                     unicode_me = False, default=0),
-                 password       = _get_user_attribute(data, user_name, 'passwdhash',
-                                                      unicode_me = False),
-                 # "hash" is the login type that indicates "hash" the user's
 @@ -216,6 +214,8 @@
                                                                 unicode_me=False, default=10))
      profile.translate_rows = try_type(int, _get_user_attribute(data, user_name, 'translaterows',

Modified: pootle/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/series?rev=2020&op=diff
==============================================================================
--- pootle/trunk/debian/patches/series (original)
+++ pootle/trunk/debian/patches/series Sun Dec  6 15:22:45 2009
@@ -4,4 +4,4 @@
 #debian_dont_send_password_by_mail.patch
 #translate_toolkit_1_4.patch
 packaging_install_outside_rootdir.patch
-import_old_config.patch
+#import_old_config.patch