[Python-apps-commits] r3349 - in packages/waf/trunk/debian (3 files)

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

    Date: Monday, July 27, 2009 @ 16:00:29
  Author: dktrkranz-guest
Revision: 3349

Intltool backward compatibility fix to allow build with older wscripts

Added:
  packages/waf/trunk/debian/patches/intltool.patch
Modified:
  packages/waf/trunk/debian/changelog
  packages/waf/trunk/debian/patches/series

Modified: packages/waf/trunk/debian/changelog
===================================================================
--- packages/waf/trunk/debian/changelog	2009-07-27 06:24:42 UTC (rev 3348)
+++ packages/waf/trunk/debian/changelog	2009-07-27 16:00:29 UTC (rev 3349)
@@ -1,3 +1,10 @@
+waf (1.5.8+dfsg-2) UNRELEASED; urgency=low
+
+  * debian/patches/intltool.patch:
+    - Intltool backward compatibility fix to allow build with older wscripts.
+
+ -- Luca Falavigna <dktrkranz at ubuntu.com>  Mon, 27 Jul 2009 15:59:31 +0000
+
 waf (1.5.8+dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #466304).

Added: packages/waf/trunk/debian/patches/intltool.patch
===================================================================
--- packages/waf/trunk/debian/patches/intltool.patch	                        (rev 0)
+++ packages/waf/trunk/debian/patches/intltool.patch	2009-07-27 16:00:29 UTC (rev 3349)
@@ -0,0 +1,26 @@
+Description:    Intltool backward compatibility fix to allow build with older wscrips
+Origin:         Debian
+Forwarded:      not-needed
+
+Index: waf-1.5.8+dfsg/wafadmin/Tools/intltool.py
+===================================================================
+--- waf-1.5.8+dfsg.orig/wafadmin/Tools/intltool.py	2009-07-27 15:47:19.000000000 +0000
++++ waf-1.5.8+dfsg/wafadmin/Tools/intltool.py	2009-07-27 15:47:59.000000000 +0000
+@@ -40,7 +40,7 @@
+ 		cache = getattr(self, 'intlcache', '.intlcache')
+ 		self.env['INTLCACHE'] = os.path.join(self.path.bldpath(self.env), podir, cache)
+ 		self.env['INTLPODIR'] = podirnode.srcpath(self.env)
+-		self.env['INTLFLAGS'] = getattr(self, 'flags', ['-q', '-u', '-c'])
++		self.env['INTLFLAGS'] = getattr(self, 'flags', None)
+ 
+ 		task = self.create_task('intltool')
+ 		task.set_inputs(node)
+@@ -96,7 +96,7 @@
+ 
+ Task.simple_task_type('po', '${POCOM} -o ${TGT} ${SRC}', color='BLUE', shell=False)
+ Task.simple_task_type('intltool',
+-	'${INTLTOOL} ${INTLFLAGS} ${INTLCACHE} ${INTLPODIR} ${SRC} ${TGT}',
++	'${INTLTOOL} ${INTLFLAGS} -q -u -c ${INTLCACHE} ${INTLPODIR} ${SRC} ${TGT}',
+ 	color='BLUE', after="cc_link cxx_link", shell=False)
+ 
+ def detect(conf):

Modified: packages/waf/trunk/debian/patches/series
===================================================================
--- packages/waf/trunk/debian/patches/series	2009-07-27 06:24:42 UTC (rev 3348)
+++ packages/waf/trunk/debian/patches/series	2009-07-27 16:00:29 UTC (rev 3349)
@@ -1,3 +1,4 @@
 WAFDIR.patch
 waf_stylesheet.patch
 unpack_in_cwd.patch
+intltool.patch