[Python-modules-commits] r16152 - in packages/web2py/trunk/debian (5 files)

[jredrejo at users.alioth.debian.org]

    Date: Friday, March 18, 2011 @ 08:20:26
  Author: jredrejo
Revision: 16152

pacakaging 1.94.4

Modified:
  packages/web2py/trunk/debian/changelog
  packages/web2py/trunk/debian/patches/avoid_write_translations
  packages/web2py/trunk/debian/patches/launcher
  packages/web2py/trunk/debian/patches/series
Deleted:
  packages/web2py/trunk/debian/patches/fix_updaterecord

Modified: packages/web2py/trunk/debian/changelog
===================================================================
--- packages/web2py/trunk/debian/changelog	2011-03-18 02:01:26 UTC (rev 16151)
+++ packages/web2py/trunk/debian/changelog	2011-03-18 08:20:26 UTC (rev 16152)
@@ -1,7 +1,13 @@
+web2py (1.94.4-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/patches/fix_updaterecord removed (included upstream)
+
+ -- José L. Redrejo Rodríguez <jredrejo at debian.org>  Fri, 18 Mar 2011 08:29:59 +0100
+
 web2py (1.93.2-1) unstable; urgency=low
 
   * New upstream release
-  * Fixed bug in launcher that avoided creating new projects
   * debian/patches/avoid_write_translations avoid web2py trying to
     rewrite language files whenever a string is translated
   * debian/patches/fix_updaterecord fixes Issue 210 in this web2py version

Modified: packages/web2py/trunk/debian/patches/avoid_write_translations
===================================================================
--- packages/web2py/trunk/debian/patches/avoid_write_translations	2011-03-18 02:01:26 UTC (rev 16151)
+++ packages/web2py/trunk/debian/patches/avoid_write_translations	2011-03-18 08:20:26 UTC (rev 16152)
@@ -1,13 +1,14 @@
-Index: web2py-1.93.2/gluon/languages.py
+Index: web2py-1.94.4/gluon/languages.py
 ===================================================================
---- web2py-1.93.2.orig/gluon/languages.py	2011-03-13 17:09:21.000000000 +0100
-+++ web2py-1.93.2/gluon/languages.py	2011-03-13 17:10:43.000000000 +0100
-@@ -278,8 +278,6 @@
-         mt = self.t.get(message, None)
+--- web2py-1.94.4.orig/gluon/languages.py	2011-03-18 08:29:32.000000000 +0100
++++ web2py-1.94.4/gluon/languages.py	2011-03-18 08:44:46.000000000 +0100
+@@ -279,7 +279,8 @@
          if mt == None:
              self.t[message] = mt = tokens[0]
--            if self.language_file and not is_gae:
+             if self.language_file and not is_gae:
 -                write_dict(self.language_file, self.t)
++                if not "/applications/welcome/" in self.language_file and not "/applications/admin/" in self.language_file:
++                    write_dict(self.language_file, self.t)
          if symbols or symbols == 0:
              return mt % symbols
          return mt

Deleted: packages/web2py/trunk/debian/patches/fix_updaterecord
===================================================================
--- packages/web2py/trunk/debian/patches/fix_updaterecord	2011-03-18 02:01:26 UTC (rev 16151)
+++ packages/web2py/trunk/debian/patches/fix_updaterecord	2011-03-18 08:20:26 UTC (rev 16152)
@@ -1,13 +0,0 @@
-Index: web2py-1.93.2/gluon/dal.py
-===================================================================
---- web2py-1.93.2.orig/gluon/dal.py	2011-03-13 17:28:09.000000000 +0100
-+++ web2py-1.93.2/gluon/dal.py	2011-03-13 17:28:24.000000000 +0100
-@@ -4773,7 +4773,7 @@
-     c = dict([(k,v) for (k,v) in b.items() if k in table.fields and table[k].type!='id'])
-     table._db(table._id==id).update(**c)
-     for (k, v) in c.items():
--        colset[k] = k 
-+        colset[k] = v 
- 
- 
- class Rows(object):

Modified: packages/web2py/trunk/debian/patches/launcher
===================================================================
--- packages/web2py/trunk/debian/patches/launcher	2011-03-18 02:01:26 UTC (rev 16151)
+++ packages/web2py/trunk/debian/patches/launcher	2011-03-18 08:20:26 UTC (rev 16152)
@@ -9,7 +9,7 @@
 +# Module:     web2py
 +# Purpose:     web2py launcher for use with Debian web2py package
 +# Date:        15-Jan-2011.
-+# Ver.:        18-Feb-2011.
++# Ver.:        13-Mar-2011.
 +# Author:    José L. Redrejo Rodríguez
 +# Copyright: 2011 -  José L. Redrejo Rodríguez <jredrejo @nospam@ debian.org>
 +#

Modified: packages/web2py/trunk/debian/patches/series
===================================================================
--- packages/web2py/trunk/debian/patches/series	2011-03-18 02:01:26 UTC (rev 16151)
+++ packages/web2py/trunk/debian/patches/series	2011-03-18 08:20:26 UTC (rev 16152)
@@ -5,4 +5,3 @@
 gtk_gui
 fix_interpreters
 avoid_write_translations
-fix_updaterecord