- up to fit 1.5.13

Changed files:
    waf-path.patch -> 1.7

diff --git a/waf-path.patch b/waf-path.patch
index 60d5b0d1e48f0d0050acb2848bef40353b15691f..d7d903e25250cdbb7b156b005259ad42408c1004 100644 (file)
--- a/waf-path.patch
+++ b/waf-path.patch
@@ -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 @@ diff -urN ./waf-1.5.4.orig/waf-light ./waf-1.5.4/waf-light
        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'])