[Python-modules-commits] r16115 - in packages/web2py/trunk/debian (6 files)

jredrejo at users.alioth.debian.org jredrejo at users.alioth.debian.org
Sun Mar 13 18:16:55 UTC 2011 

    Date: Sunday, March 13, 2011 @ 18:16:37
  Author: jredrejo
Revision: 16115

preparing packaging for new upstream release

Added:
  packages/web2py/trunk/debian/patches/avoid_write_translations
  packages/web2py/trunk/debian/patches/fix_updaterecord
Modified:
  packages/web2py/trunk/debian/changelog
  packages/web2py/trunk/debian/patches/gtk_gui
  packages/web2py/trunk/debian/patches/series
  packages/web2py/trunk/debian/rules

Modified: packages/web2py/trunk/debian/changelog
===================================================================
--- packages/web2py/trunk/debian/changelog	2011-03-13 17:44:15 UTC (rev 16114)
+++ packages/web2py/trunk/debian/changelog	2011-03-13 18:16:37 UTC (rev 16115)
@@ -1,3 +1,15 @@
+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
+  * debian/patches/gtk_gui refreshed
+
+ -- José L. Redrejo Rodríguez <jredrejo at debian.org>  Sun, 13 Mar 2011 17:06:58 +0100
+
+
 web2py (1.92.1-1) unstable; urgency=low
 
   * Initial release (Closes: #583384)

Added: packages/web2py/trunk/debian/patches/avoid_write_translations
===================================================================
--- packages/web2py/trunk/debian/patches/avoid_write_translations	                        (rev 0)
+++ packages/web2py/trunk/debian/patches/avoid_write_translations	2011-03-13 18:16:37 UTC (rev 16115)
@@ -0,0 +1,13 @@
+Index: web2py-1.93.2/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)
+         if mt == None:
+             self.t[message] = mt = tokens[0]
+-            if self.language_file and not is_gae:
+-                write_dict(self.language_file, self.t)
+         if symbols or symbols == 0:
+             return mt % symbols
+         return mt

Added: packages/web2py/trunk/debian/patches/fix_updaterecord
===================================================================
--- packages/web2py/trunk/debian/patches/fix_updaterecord	                        (rev 0)
+++ packages/web2py/trunk/debian/patches/fix_updaterecord	2011-03-13 18:16:37 UTC (rev 16115)
@@ -0,0 +1,13 @@
+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/gtk_gui
===================================================================
--- packages/web2py/trunk/debian/patches/gtk_gui	2011-03-13 17:44:15 UTC (rev 16114)
+++ packages/web2py/trunk/debian/patches/gtk_gui	2011-03-13 18:16:37 UTC (rev 16115)
@@ -1,7 +1,7 @@
-Index: web2py-1.92.1/gluon/contrib/gtk_presentation.py
+Index: web2py-1.93.2/gluon/contrib/gtk_presentation.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ web2py-1.92.1/gluon/contrib/gtk_presentation.py	2011-02-27 16:17:49.000000000 +0000
++++ web2py-1.93.2/gluon/contrib/gtk_presentation.py	2011-03-13 17:55:04.000000000 +0100
 @@ -0,0 +1,52 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
@@ -55,10 +55,10 @@
 +        label.show()
 +        return label        
 +   
-Index: web2py-1.92.1/gluon/widget.py
+Index: web2py-1.93.2/gluon/widget.py
 ===================================================================
---- web2py-1.92.1.orig/gluon/widget.py	2011-02-27 16:16:53.000000000 +0000
-+++ web2py-1.92.1/gluon/widget.py	2011-02-27 16:17:59.000000000 +0000
+--- web2py-1.93.2.orig/gluon/widget.py	2011-03-13 17:06:11.000000000 +0100
++++ web2py-1.93.2/gluon/widget.py	2011-03-13 17:55:04.000000000 +0100
 @@ -34,6 +34,12 @@
  except:
      pass
@@ -366,15 +366,6 @@
  
      root.withdraw()
  
-@@ -408,7 +698,7 @@
-         """ Update canvas """
- 
-         try:
--            t1 = os.path.size('httpserver.log')
-+            t1 = os.path.getsize('httpserver.log')
-         except:
-             self.canvas.after(1000, self.update_canvas)
-             return
 @@ -438,7 +728,6 @@
  
          self.canvas.after(1000, self.update_canvas)
@@ -383,7 +374,7 @@
  def console():
      """ Defines the behavior of the console web2py execution """
      import optparse
-@@ -825,21 +1114,49 @@
+@@ -834,21 +1123,49 @@
          sys.exit(1)
  
      root = None

Modified: packages/web2py/trunk/debian/patches/series
===================================================================
--- packages/web2py/trunk/debian/patches/series	2011-03-13 17:44:15 UTC (rev 16114)
+++ packages/web2py/trunk/debian/patches/series	2011-03-13 18:16:37 UTC (rev 16115)
@@ -4,3 +4,5 @@
 avoid_upgrading
 gtk_gui
 fix_interpreters
+avoid_write_translations
+fix_updaterecord

Modified: packages/web2py/trunk/debian/rules
===================================================================
--- packages/web2py/trunk/debian/rules	2011-03-13 17:44:15 UTC (rev 16114)
+++ packages/web2py/trunk/debian/rules	2011-03-13 18:16:37 UTC (rev 16115)
@@ -42,9 +42,10 @@
 		ln -sf /usr/share/javascript/jquery/jquery.js {} \;
 
 	# Removed embedded Feedparser module
-	# For a Lenny backport, pyshared must be replaced with python-support/python-feedparser
+	# For a Lenny backport, pyshared dir must be changed:
+	#ln -sf /usr/share/python-support/python-feedparserfeedparser.py  debian/python-gluon/usr/share/python-support/python-gluon/gluon/contrib/feedparser.py
 	ln -sf /usr/share/pyshared/feedparser.py  debian/python-gluon/usr/share/python-support/python-gluon/gluon/contrib/feedparser.py
-
+	
 override_dh_installman:
 	dh_installman debian/web2py.1 -ppython-web2py

More information about the Python-modules-commits mailing list