From da4f15e9bb5b9c832efa4407b0d9ac19d608f725 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Sat, 14 Apr 2012 14:47:18 +0200
Subject: [PATCH] don't repack waf for now

---
 debian/changelog |  2 --
 debian/rules     | 23 +++++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index deede9d0..055fa28b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ midori (0.4.4-1) UNRELEASED; urgency=low
   * debian/midori.maintscript:
     - handle the /etc/xdg/midori/extensions/libadblock.so removal there.
                                                                 closes: #660303
-  * debian/rules:
-    - rebuild waf script before using it.                       closes: #645191
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 08 Mar 2012 23:42:54 +0100
 
diff --git a/debian/rules b/debian/rules
index b36a2f1c..1c82c045 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,16 +23,16 @@ endif
 %:
 	dh $@
 
-WAF=./waf.regen
+WAF=./waf
 
-$(WAF): waf
-	# rebuild the waf script
-	sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2
-	(sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr
-	(sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr  -e '/^#<==$$/ p') > waf.regen
-	chmod 755 waf.regen
-	# ensure both scripts are the same
-	cmp waf waf.regen && (rm waf.hdr waf.orig.tar.bz2)
+#$(WAF): waf
+#	# rebuild the waf script
+#	sed < waf -e '1,/^#==>$$/ d' -e '/^#<==$$/ d' | tr -d '\n' | sed -e 's/.//' -e 's/#[*]/\n/g' -e 's/#%/\r/g' > waf.orig.tar.bz2
+#	(sed -n < waf -e '1,/^#==>$$/ p'; echo REPLACED BY ENCODED TAR.BZ2; sed -n < waf -e '/^#<==$$/ p') > waf.hdr
+#	(sed -n < waf.hdr -e '1,/^#==>$$/ p'; printf '#'; perl -pe < waf.orig.tar.bz2 's/\n/#*/g; s/\r/#%/g;'; echo; sed -n < waf.hdr  -e '/^#<==$$/ p') > waf.regen
+#	chmod 755 waf.regen
+#	# ensure both scripts are the same
+#	cmp waf waf.regen && (rm waf.hdr waf.orig.tar.bz2)
 
 debian/presubj: debian/presubj.in
 	@echo "presubj parameters:"
@@ -46,14 +46,13 @@ debian/presubj: debian/presubj.in
 override_dh_install: debian/presubj
 	$(CMD) --fail-missing
 
-override_dh_auto_clean: $(WAF)
+override_dh_auto_clean:
 	$(WAF) --nocache distclean
 	rm -rf _build_
 	rm -rf .waf*
 	rm -rf .lock-wscript
-	rm -f $(WAF)
 
-override_dh_auto_configure: $(WAF)
+override_dh_auto_configure:
 	$(WAF) --nocache configure --debug-level=none --prefix /usr
 
 override_dh_auto_build: