don't repack waf for now

diff --git a/debian/changelog b/debian/changelog
index deede9d080bb5a5e4b650e81937b27ebd6c1ff25..055fa28b9c0ae46ce928ee6991e0985b170132eb 100644 (file)
--- 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 b36a2f1c927607a5e8e31b51faf13b808479a28e..1c82c045e069a969aa87167e6c849c1129d67cf3 100755 (executable)
--- 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: