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

[dktrkranz at users.alioth.debian.org]

    Date: Wednesday, November 18, 2009 @ 16:44:29
  Author: dktrkranz
Revision: 4143

bld.install_files.patch removed, applied upstream

Modified:
  packages/waf/trunk/debian/changelog
  packages/waf/trunk/debian/patches/series
Deleted:
  packages/waf/trunk/debian/patches/bld.install_files.patch

Modified: packages/waf/trunk/debian/changelog
===================================================================
--- packages/waf/trunk/debian/changelog	2009-11-18 16:36:38 UTC (rev 4142)
+++ packages/waf/trunk/debian/changelog	2009-11-18 16:44:29 UTC (rev 4143)
@@ -1,8 +1,10 @@
 waf (1.5.10+dfsg-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release.
+  * debian/patches/bld.install_files.patch:
+    - Removed, applied upstream.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Wed, 18 Nov 2009 16:36:10 +0000
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 18 Nov 2009 16:42:58 +0000
 
 waf (1.5.9+dfsg-2) unstable; urgency=low
 

Deleted: packages/waf/trunk/debian/patches/bld.install_files.patch
===================================================================
--- packages/waf/trunk/debian/patches/bld.install_files.patch	2009-11-18 16:36:38 UTC (rev 4142)
+++ packages/waf/trunk/debian/patches/bld.install_files.patch	2009-11-18 16:44:29 UTC (rev 4143)
@@ -1,41 +0,0 @@
-Description:	Allow single nodes in bld.install_files
-Bug-Debian:	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548329
-Origin:		Upstream
-Forwarded:	http://code.google.com/p/waf/source/detail?r=6728#
-
-Index: waf-1.5.9+dfsg/wafadmin/Build.py
-===================================================================
---- waf-1.5.9+dfsg.orig/wafadmin/Build.py	2009-09-26 02:03:52.000000000 +0000
-+++ waf-1.5.9+dfsg/wafadmin/Build.py	2009-09-26 02:03:27.000000000 +0000
-@@ -801,6 +801,9 @@
- 		else:
- 			lst = Utils.to_list(files)
- 
-+		if not getattr(lst, '__iter__', False):
-+			lst = [lst]
-+
- 		destpath = self.get_install_path(path, env)
- 
- 		Utils.check_dir(destpath)
-Index: waf-1.5.9+dfsg/wafadmin/Tools/ccroot.py
-===================================================================
---- waf-1.5.9+dfsg.orig/wafadmin/Tools/ccroot.py	2009-09-26 02:03:52.000000000 +0000
-+++ waf-1.5.9+dfsg/wafadmin/Tools/ccroot.py	2009-09-26 02:03:48.000000000 +0000
-@@ -239,7 +239,7 @@
- 	"""you may kill this method to inject your own installation for the first element
- 	any other install should only process its own nodes and not those from the others"""
- 	if self.install_path:
--		self.bld.install_files(self.install_path, [self.link_task.outputs[0]], env=self.env, chmod=self.chmod)
-+		self.bld.install_files(self.install_path, self.link_task.outputs[0], env=self.env, chmod=self.chmod)
- 
- @feature('cc', 'cxx')
- @after('apply_type_vars', 'apply_lib_vars', 'apply_core')
-@@ -542,7 +542,7 @@
- 
- 	# install the dll in the bin dir
- 	dll = self.link_task.outputs[0]
--	self.bld.install_files(bindir, [dll], self.env, self.chmod)
-+	self.bld.install_files(bindir, dll, self.env, self.chmod)
- 
- 	# add linker flags to generate the import lib
- 	implib = self.env['implib_PATTERN'] % os.path.split(self.target)[1]

Modified: packages/waf/trunk/debian/patches/series
===================================================================
--- packages/waf/trunk/debian/patches/series	2009-11-18 16:36:38 UTC (rev 4142)
+++ packages/waf/trunk/debian/patches/series	2009-11-18 16:44:29 UTC (rev 4143)
@@ -2,5 +2,4 @@
 waf_stylesheet.patch
 unpack_in_cwd.patch
 intltool.patch
-bld.install_files.patch
 fun_check.patch