use bundled waf again (Closes: 571709)

diff --git a/debian/changelog b/debian/changelog
index 7560fc041c95227b6edfbe3827fd20eb98ea4ef6..ea504732e489d3f382de4d63f51c4e225a853573 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ midori (0.2.4-1) UNRELEASED; urgency=low
 
   * New Upstream Version
     - update d/copyright
+  * use bundled waf again (Closes: 571709)
 
- -- Ryan Niebur <ryan@debian.org>  Sun, 07 Mar 2010 21:56:25 -0800
+ -- Ryan Niebur <ryan@debian.org>  Sun, 07 Mar 2010 21:58:06 -0800
 
 midori (0.2.2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 6a73fccf317f9c185342430087cd7e471cb82f39..c9997631331110dcc004233a51ee6ee377153b0c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 7.0.50),
  libwebkit-dev (>= 1.1.15),
  libxml2-dev (>= 2.6),
 # For waf:
- waf,
+ python,
 # Optional dependencies:
  intltool,
  libidn11-dev,

diff --git a/debian/rules b/debian/rules
index 304e9235df73f5a9fe8f4b125c833a0b3d590595..5476a35a7eaa3974f858da79be1d9fae75320295 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,8 @@ override_dh_quilt_patch:
        test -e midori/midori-debian.h
        $(CMD)
 
-WAF=/usr/bin/waf
-#WAF=./waf
+#WAF=/usr/bin/waf
+WAF=./waf
 
 debian/presubj: debian/presubj.in
        @echo "presubj parameters:"