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

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

Author: nekral-guest
Date: Fri Sep 11 23:13:38 2009
New Revision: 1937

URL: http://svn.debian.org/wsvn/?sc=1&rev=1937
Log:
    + debian/patches/import_old_config.patch: activationcode is now
      activation_key and is in the profile table, not user.

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

Modified: pootle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/changelog?rev=1937&op=diff
==============================================================================
--- pootle/trunk/debian/changelog (original)
+++ pootle/trunk/debian/changelog Fri Sep 11 23:13:38 2009
@@ -12,6 +12,8 @@
     + packaging_install_outside_rootdir.patch: When installing in a temporary
       root directory to prepare a package, the paths in localsettings.py are
       invalid. (--prefix should be checked.
+    + debian/patches/import_old_config.patch: activationcode is now
+      activation_key and is in the profile table, not user.
     + removed all patches. They should be re-checked.
   * debian/pootle.docs: There is no Pootle directory anymore.
   * debian/pootle.init: With the new version, start-stop-daemon needs to do
@@ -27,8 +29,9 @@
   * debian/pootle.postinst: Configure the pootle database on installation and
     try to import users during updates.
   * debian/README.Debian: Update some Debian specific documentation.
-
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sat, 12 Sep 2009 00:43:55 +0200
+  * 
+
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sat, 12 Sep 2009 01:12:43 +0200
 
 pootle (1.2.1-4) unstable; urgency=low
 

Added: pootle/trunk/debian/patches/import_old_config.patch
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/import_old_config.patch?rev=1937&op=file
==============================================================================
--- pootle/trunk/debian/patches/import_old_config.patch (added)
+++ pootle/trunk/debian/patches/import_old_config.patch Fri Sep 11 23:13:38 2009
@@ -1,0 +1,20 @@
+--- 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',
+                                                                unicode_me=False, default=10))
++    profile.activation_key = _get_user_attribute(data, user_name, 'activationcode',
++                                                 unicode_me = False, default=0),
+     # uilanguage
+     raw_uilanguage = _get_user_attribute(data, user_name, 'uilanguages')
+     assert ',' not in raw_uilanguage # just one value here

Modified: pootle/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/patches/series?rev=1937&op=diff
==============================================================================
--- pootle/trunk/debian/patches/series (original)
+++ pootle/trunk/debian/patches/series Fri Sep 11 23:13:38 2009
@@ -4,3 +4,4 @@
 #debian_dont_send_password_by_mail.patch
 #translate_toolkit_1_4.patch
 packaging_install_outside_rootdir.patch
+import_old_config.patch