switch to system waf

diff --git a/debian/changelog b/debian/changelog
index 62df1cfc80370a2f26ae5e83d9bf6ebbe5f5a8e9..db87d516b67747c3ced25799655cfbb2bf41ff81 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,11 @@ midori (0.2.2-1) UNRELEASED; urgency=low
     reproduce it in the Webkit test browser. Figure out the package name
     and the path to GtkLauncher automagically during build. (Closes:
     #562501)
+  * switch to system waf
+    - the FTBFS #559989 is no longer the fault of anything in my package,
+      and I've set #561130 in the BTS to affect midori, so (Closes: #559989)
 
- -- Ryan Niebur <ryan@debian.org>  Thu, 24 Dec 2009 17:35:45 -0800
+ -- Ryan Niebur <ryan@debian.org>  Thu, 24 Dec 2009 17:47:19 -0800
 
 midori (0.2.0-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index c9997631331110dcc004233a51ee6ee377153b0c..6a73fccf317f9c185342430087cd7e471cb82f39 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:
- python,
+ waf,
 # Optional dependencies:
  intltool,
  libidn11-dev,

diff --git a/debian/rules b/debian/rules
index 5476a35a7eaa3974f858da79be1d9fae75320295..304e9235df73f5a9fe8f4b125c833a0b3d590595 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:"