From 24006e6b453d09e21da105d916a2583d68ecf0cd Mon Sep 17 00:00:00 2001
From: Ryan Niebur <ryanryan52@gmail.com>
Date: Sun, 18 Apr 2010 23:41:47 -0700
Subject: [PATCH] fix building in Serial mode (on HPPA)

---
 debian/changelog                |  8 ++++++++
 debian/patches/default-homepage |  2 +-
 debian/patches/fix-serial-build | 13 +++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  4 ++--
 debian/source/format            |  1 +
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/fix-serial-build
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index 580b4aac..3a407fcf 100644
--- 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 c26d0dd0..73c39184 100644
--- 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
index 00000000..1754c070
--- /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 b0c04168..3d526d8c 100644
--- 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 518bb8d3..8afbbbf6 100755
--- 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
index 00000000..163aaf8d
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)