packages: waf/waf-path.patch - up to fit 1.5.13

[duddits]

Author: duddits                      Date: Tue Mar  2 22:40:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to fit 1.5.13

---- Files affected:
packages/waf:
   waf-path.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/waf/waf-path.patch
diff -u packages/waf/waf-path.patch:1.6 packages/waf/waf-path.patch:1.7
--- packages/waf/waf-path.patch:1.6	Sun May 31 15:02:20 2009
+++ packages/waf/waf-path.patch	Tue Mar  2 23:40:11 2010
@@ -1,13 +1,13 @@
-diff -urN ./waf-1.5.4.orig/waf-light ./waf-1.5.4/waf-light
---- waf-1.5.4.orig/waf-light	2009-04-07 20:34:22.000000000 +0200
-+++ waf-1.5.4/waf-light	2009-05-31 13:33:38.703600164 +0200
+diff -burNp waf-1.5.13/waf-light waf-1.5.13-dud/waf-light
+--- waf-1.5.13/waf-light	2010-02-16 22:42:45.000000000 +0100
++++ waf-1.5.13-dud/waf-light	2010-03-02 23:37:42.640873759 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
- # encoding: utf-8
- # Thomas Nagy, 2005-2009
+ # encoding: ISO8859-1
+ # Thomas Nagy, 2005-2010
  
-@@ -117,7 +117,7 @@
+@@ -127,7 +127,7 @@ def find_lib():
  		if w: return w
  		err("waf-light requires wafadmin -> export WAFDIR=/folder")
  
@@ -16,15 +16,15 @@
  	for i in [INSTALL,'/usr','/usr/local','/opt']:
  		w = test(i+dir)
  		if w: return w
-diff -urN ./waf-1.5.4.orig/wscript ./waf-1.5.4/wscript
---- waf-1.5.4.orig/wscript	2009-04-07 20:34:22.000000000 +0200
-+++ waf-1.5.4/wscript	2009-05-31 13:35:21.368995500 +0200
-@@ -314,7 +314,7 @@
+diff -burNp waf-1.5.13/wscript waf-1.5.13-dud/wscript
+--- waf-1.5.13/wscript	2010-02-16 22:42:46.000000000 +0100
++++ waf-1.5.13-dud/wscript	2010-03-02 23:38:37.807336784 +0100
+@@ -313,7 +313,7 @@ def build(bld):
  		if val != True and val != "y": sys.exit(1)
  		create_waf()
  
 -	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
 +	dir = os.path.join('lib', 'waf', 'wafadmin')
  
- 	wafadmin = bld.new_task_gen('py')
+ 	wafadmin = bld('py')
  	wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/waf/waf-path.patch?r1=1.6&r2=1.7&f=u