[Python-modules-commits] r16472 - in packages/web2py (5 files)

[jredrejo at users.alioth.debian.org]

    Date: Monday, April 11, 2011 @ 12:02:27
  Author: jredrejo
Revision: 16472

Upload of version 1.94.6-1

Added:
  packages/web2py/tags/1.94.6-1/
Modified:
  packages/web2py/tags/1.94.6-1/debian/changelog
  packages/web2py/tags/1.94.6-1/debian/patches/launcher
  packages/web2py/trunk/debian/changelog
  packages/web2py/trunk/debian/patches/launcher


Property changes on: packages/web2py/tags/1.94.6-1
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: packages/web2py/tags/1.94.6-1/debian/changelog
===================================================================
--- packages/web2py/trunk/debian/changelog	2011-04-11 08:26:03 UTC (rev 16471)
+++ packages/web2py/tags/1.94.6-1/debian/changelog	2011-04-11 12:02:27 UTC (rev 16472)
@@ -1,3 +1,11 @@
+web2py (1.94.6-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/patches/avoid_write_translations avoid web2py trying to
+    rewrite language files whenever a string is translated  
+
+ -- José L. Redrejo Rodríguez <jredrejo at debian.org>  Fri, 08 Apr 2011 13:18:32 +0200
+ 
 web2py (1.94.4-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/web2py/tags/1.94.6-1/debian/patches/launcher
===================================================================
--- packages/web2py/trunk/debian/patches/launcher	2011-04-11 08:26:03 UTC (rev 16471)
+++ packages/web2py/tags/1.94.6-1/debian/patches/launcher	2011-04-11 12:02:27 UTC (rev 16472)
@@ -1,8 +1,8 @@
-Index: web2py-1.92.1/web2py
+Index: web2py-1.94.6/web2py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ web2py-1.92.1/web2py	2011-02-21 08:59:32.000000000 +0000
-@@ -0,0 +1,113 @@
++++ web2py-1.94.6/web2py	2011-04-11 13:25:33.000000000 +0200
+@@ -0,0 +1,128 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
 +##############################################################################
@@ -32,17 +32,33 @@
 +import sys
 +import pwd
 +from shutil import copytree
++import tarfile
++import re
++from gzip import open as gzopen
++import pdb
 +
 +web2py_skeleton="/usr/share/web2py/applications"
++      
++def w2p_pack(filename, path):
++    if path[-1:] != '/':
++        path = path + '/' 	
++    tarname = filename + '.tar'
++    tar = tarfile.TarFile(tarname, 'w')
++    tar.add(path,"",True)				 
++    tar.close()        
++    w2pfp = gzopen(filename, 'wb')
++    tarfp = open(tarname, 'rb')
++    w2pfp.write(tarfp.read())
++    w2pfp.close()
++    tarfp.close()
++    os.unlink(tarname)
 +
-+
-+
 +def create_dir(path):
 +	if not os.path.exists(path):
 +		try:
 +			os.makedirs(path)
 +		except:
-+			print "Error trying to make %s directory to run webwpy" % (path)
++			print "Error trying to make %s directory to run web2py" % (path)
 +			sys.exit(1)
 +		return False
 +	else:
@@ -67,8 +83,7 @@
 +create_dir(web2py_applications)	
 +
 +if not os.path.exists(os.path.join(web2py_dir,"welcome.w2p")):
-+	open(os.path.join(web2py_dir,"welcome.w2p"), 'w').close() 
-+
++	w2p_pack(os.path.join(web2py_dir,"welcome.w2p"),os.path.join(web2py_skeleton,"welcome"))
 +#Create symlink to welcome application
 +welcome_dir=os.path.join(web2py_applications,"welcome")
 +if not os.path.exists(welcome_dir):

Modified: packages/web2py/trunk/debian/changelog
===================================================================
--- packages/web2py/trunk/debian/changelog	2011-04-11 08:26:03 UTC (rev 16471)
+++ packages/web2py/trunk/debian/changelog	2011-04-11 12:02:27 UTC (rev 16472)
@@ -1,3 +1,11 @@
+web2py (1.94.6-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/patches/avoid_write_translations avoid web2py trying to
+    rewrite language files whenever a string is translated  
+
+ -- José L. Redrejo Rodríguez <jredrejo at debian.org>  Fri, 08 Apr 2011 13:18:32 +0200
+ 
 web2py (1.94.4-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/web2py/trunk/debian/patches/launcher
===================================================================
--- packages/web2py/trunk/debian/patches/launcher	2011-04-11 08:26:03 UTC (rev 16471)
+++ packages/web2py/trunk/debian/patches/launcher	2011-04-11 12:02:27 UTC (rev 16472)
@@ -1,8 +1,8 @@
-Index: web2py-1.92.1/web2py
+Index: web2py-1.94.6/web2py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ web2py-1.92.1/web2py	2011-02-21 08:59:32.000000000 +0000
-@@ -0,0 +1,113 @@
++++ web2py-1.94.6/web2py	2011-04-11 13:25:33.000000000 +0200
+@@ -0,0 +1,128 @@
 +#!/usr/bin/env python
 +# -*- coding: utf-8 -*-
 +##############################################################################
@@ -32,17 +32,33 @@
 +import sys
 +import pwd
 +from shutil import copytree
++import tarfile
++import re
++from gzip import open as gzopen
++import pdb
 +
 +web2py_skeleton="/usr/share/web2py/applications"
++      
++def w2p_pack(filename, path):
++    if path[-1:] != '/':
++        path = path + '/' 	
++    tarname = filename + '.tar'
++    tar = tarfile.TarFile(tarname, 'w')
++    tar.add(path,"",True)				 
++    tar.close()        
++    w2pfp = gzopen(filename, 'wb')
++    tarfp = open(tarname, 'rb')
++    w2pfp.write(tarfp.read())
++    w2pfp.close()
++    tarfp.close()
++    os.unlink(tarname)
 +
-+
-+
 +def create_dir(path):
 +	if not os.path.exists(path):
 +		try:
 +			os.makedirs(path)
 +		except:
-+			print "Error trying to make %s directory to run webwpy" % (path)
++			print "Error trying to make %s directory to run web2py" % (path)
 +			sys.exit(1)
 +		return False
 +	else:
@@ -67,8 +83,7 @@
 +create_dir(web2py_applications)	
 +
 +if not os.path.exists(os.path.join(web2py_dir,"welcome.w2p")):
-+	open(os.path.join(web2py_dir,"welcome.w2p"), 'w').close() 
-+
++	w2p_pack(os.path.join(web2py_dir,"welcome.w2p"),os.path.join(web2py_skeleton,"welcome"))
 +#Create symlink to welcome application
 +welcome_dir=os.path.join(web2py_applications,"welcome")
 +if not os.path.exists(welcome_dir):