[SCM] slv2/master: With waf unpacked, 02-hppa_parallel.patch could be applied by quilt.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6dd866168528ed7e0cea900dba1d121c99405306
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 10 21:11:44 2012 +0100

    With waf unpacked, 02-hppa_parallel.patch could be applied by quilt.

diff --git a/debian/patches/02-hppa_parallel.patch b/debian/patches/02-hppa_parallel.patch
index 568409d..20e7c41 100644
--- a/debian/patches/02-hppa_parallel.patch
+++ b/debian/patches/02-hppa_parallel.patch
@@ -1,9 +1,13 @@
 Description: Disable parallel build on hppa architecture.
 Origin: http://code.google.com/p/waf/source/browse/tags/waf-1.5.0/playground/serial.py
 
---- wafadmin/Runner.py.orig	2009-11-14 22:09:02.000000000 +0000
-+++ wafadmin/Runner.py	2010-05-09 16:16:36.000000000 +0000
-@@ -151,3 +151,100 @@
+---
+ wafadmin/Runner.py |   97 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 97 insertions(+)
+
+--- slv2.orig/wafadmin/Runner.py
++++ slv2/wafadmin/Runner.py
+@@ -150,3 +150,100 @@ class Parallel(object):
  			self.get_out()
  		assert(self.count==0 or self.stop)
  
@@ -19,7 +23,7 @@ Origin: http://code.google.com/p/waf/source/browse/tags/waf-1.5.0/playground/ser
 +		self.error = 0
 +
 +		self.switchflag = 1 # postpone
-+		
++
 +		self.consumers = None
 +
 +	# warning, this one is recursive ..
diff --git a/debian/patches/series b/debian/patches/series
index 88109f3..58e23c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-spelling_errors.patch
+02-hppa_parallel.patch
 raptor_symbol_fix.patch
diff --git a/debian/rules b/debian/rules
index 5dea142..d264a32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,12 @@ WAF = ./waf
 	dh $@
 
 override_dh_auto_configure:
-	$(WAF) --version && cd .waf*/wafadmin && \
-		patch -p1 < $(CURDIR)/debian/patches/02-hppa_parallel.patch
 	LINKFLAGS="-ldl" $(WAF) configure   --prefix=/usr  --build-docs
 
 override_dh_auto_build:
 	$(WAF)
 
 override_dh_auto_clean:
-	$(WAF) --version && cd .waf*/wafadmin && \
-		patch -p1 < $(CURDIR)/debian/patches/02-hppa_parallel.patch
 	$(WAF) distclean
 	find -name "*.pyc" -delete
 	dh_auto_clean

-- 
slv2 packaging