packages: waf/waf-path.patch - adjusted for 1.5.6

amateja amateja at pld-linux.org
Sun May 31 15:02:25 CEST 2009


Author: amateja                      Date: Sun May 31 13:02:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted for 1.5.6

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

---- Diffs:

================================================================
Index: packages/waf/waf-path.patch
diff -u packages/waf/waf-path.patch:1.5 packages/waf/waf-path.patch:1.6
--- packages/waf/waf-path.patch:1.5	Wed Feb 11 12:35:54 2009
+++ packages/waf/waf-path.patch	Sun May 31 15:02:20 2009
@@ -1,25 +1,25 @@
-diff -burNp waf-1.5.3/waf-light waf-1.5.3-dud/waf-light
---- waf-1.5.3/waf-light	2009-01-30 20:47:11.000000000 +0100
-+++ waf-1.5.3-dud/waf-light	2009-02-11 12:32:27.151272688 +0100
+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
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
  # encoding: utf-8
  # Thomas Nagy, 2005-2009
  
-@@ -102,7 +102,7 @@ def find_lib():
+@@ -117,7 +117,7 @@
  		if w: return w
  		err("waf-light requires wafadmin -> export WAFDIR=/folder")
  
--	dir = "/lib/waf-%s-%s/" % (VERSION, REVISION)
-+	dir = "/lib/waf/" 
+-	dir = "/lib/%s-%s-%s/" % (WAF, VERSION, REVISION)
++	dir = "/lib/waf/"
  	for i in [INSTALL,'/usr','/usr/local','/opt']:
  		w = test(i+dir)
  		if w: return w
-diff -burNp waf-1.5.3/wscript waf-1.5.3-dud/wscript
---- waf-1.5.3/wscript	2009-01-30 20:45:24.000000000 +0100
-+++ waf-1.5.3-dud/wscript	2009-02-11 12:31:25.097529677 +0100
-@@ -326,7 +326,7 @@ def build(bld):
+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 @@
  		if val != True and val != "y": sys.exit(1)
  		create_waf()
  
================================================================

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



More information about the pld-cvs-commit mailing list