fix building in Serial mode (on HPPA)

diff --git a/debian/changelog b/debian/changelog
index 580b4aac4f8551613c058008259d58e819fb6bd8..3a407fcf9efa724ab854540e9bca047e459fd0b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+midori (0.2.4-3) UNRELEASED; urgency=low
+
+  * don't run the tests
+  * add debian/source/format
+  * fix building in Serial mode (on HPPA)
+
+ -- Ryan Niebur <ryan@debian.org>  Sun, 18 Apr 2010 23:41:17 -0700
+
 midori (0.2.4-2) unstable; urgency=low
 
   * use a patched waf for hppa, thanks to Jakub Wilk (Closes: #559989)

diff --git a/debian/patches/default-homepage b/debian/patches/default-homepage
index c26d0dd0dfb437cb7259dab28aeb1080e02141f9..73c3918402b829a2dfe4f0f97809f27c16477feb 100644 (file)
--- a/debian/patches/default-homepage
+++ b/debian/patches/default-homepage
@@ -17,7 +17,7 @@ Midori's user documentation.  This is similar to what Dillo did/does.
  
  #include "sokoke.h"
  
-@@ -602,7 +603,7 @@
+@@ -609,7 +610,7 @@
                                       "homepage",
                                       _("Homepage:"),
                                       _("The homepage"),

diff --git a/debian/patches/fix-serial-build b/debian/patches/fix-serial-build
new file mode 100644 (file)
index 0000000..1754c07
--- /dev/null
+++ b/debian/patches/fix-serial-build
@@ -0,0 +1,13 @@
+fix building in Serial mode (on HPPA)
+
+--- a/wscript
++++ b/wscript
+@@ -466,7 +466,7 @@
+             obj.source = 'data/' + APPNAME + '.desktop.in'
+             obj.install_path = appdir
+             obj.flags  = ['-d', '-c']
+-            bld.install_files (appdir, 'data/' + APPNAME + '.desktop')
++            bld.install_files (appdir, blddir + '/default/data/' + APPNAME + '.desktop')
+         else:
+             folder = os.path.abspath (blddir + '/default/data')
+             Utils.check_dir (folder)

diff --git a/debian/patches/series b/debian/patches/series
index b0c041684fc9c88ab44c99afc5780883c10a1b95..3d526d8c3291cac4ed4787b5f92c0471c553713f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+fix-serial-build
 default-homepage
 add-debian-searches

diff --git a/debian/rules b/debian/rules
index 518bb8d30f715c2f181d5299198daf0dfaae00dd..8afbbbf6b9f89f634ed32f27f9b2c0b2247e548c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,8 +47,8 @@ override_dh_auto_configure: $(WAFADMIN_FILE)
 override_dh_auto_build: $(WAFADMIN_FILE)
        $(WAF) --nocache build --debug full
 
-override_dh_auto_test: $(WAFADMIN_FILE)
-       xvfb-run $(WAF) --nocache check
+#override_dh_auto_test: $(WAFADMIN_FILE)
+#      xvfb-run $(WAF) --nocache check
 
 override_dh_auto_install: $(WAFADMIN_FILE)
        $(WAF) --nocache install --destdir debian/tmp

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)