From eb943a778a17654cea5374401aefc00f97a2dc78 Mon Sep 17 00:00:00 2001 From: Ryan Niebur Date: Thu, 28 May 2009 23:44:48 -0700 Subject: [PATCH] change the default-homepage patch to use the files in debian/config/ to set the default homepage based on whether it's debian, ubuntu, etc (second half of ubuntu diff) --- debian/changelog | 5 ++++- debian/clean | 1 + debian/config/Debian.h | 1 + debian/config/Ubuntu.h | 1 + debian/control | 1 + debian/patches/default-homepage | 12 ++++++++++-- debian/rules | 5 +++++ 7 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 debian/clean create mode 100644 debian/config/Debian.h create mode 100644 debian/config/Ubuntu.h diff --git a/debian/changelog b/debian/changelog index aef9f88f..380e8ac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,11 @@ midori (0.1.7-1) UNRELEASED; urgency=low patch (Closes: #525991) * New Upstream Version * refresh patches + * change the default-homepage patch to use the files in debian/config/ + to set the default homepage based on whether it's debian, ubuntu, + etc (second half of ubuntu diff) - -- Ryan Niebur Thu, 28 May 2009 23:16:32 -0700 + -- Ryan Niebur Thu, 28 May 2009 23:28:24 -0700 midori (0.1.6-1) experimental; urgency=low diff --git a/debian/clean b/debian/clean new file mode 100644 index 00000000..d2a36720 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +midori/midori-debian.h diff --git a/debian/config/Debian.h b/debian/config/Debian.h new file mode 100644 index 00000000..318a23d1 --- /dev/null +++ b/debian/config/Debian.h @@ -0,0 +1 @@ +#define DEBIAN_DISTRO_DEFAULT_HOMEPAGE "file:///usr/share/doc/midori/user/midori.html" diff --git a/debian/config/Ubuntu.h b/debian/config/Ubuntu.h new file mode 100644 index 00000000..d3466f2c --- /dev/null +++ b/debian/config/Ubuntu.h @@ -0,0 +1 @@ +#define DEBIAN_DISTRO_DEFAULT_HOMEPAGE "file:///usr/share/ubuntu-artwork/home/index.html" diff --git a/debian/control b/debian/control index 2aa88d67..38776fe5 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ryan Niebur Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), + lsb-release, libgtk2.0-dev (>= 2.10), libglib2.0-dev, libwebkit-dev (>= 1.1), diff --git a/debian/patches/default-homepage b/debian/patches/default-homepage index 2795d051..e20d89bc 100644 --- a/debian/patches/default-homepage +++ b/debian/patches/default-homepage @@ -9,12 +9,20 @@ Midori's user documentation. This is similar to what Dillo did/does. --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c -@@ -558,7 +558,7 @@ +@@ -10,6 +10,7 @@ + */ + + #include "midori-websettings.h" ++#include "midori-debian.h" + + #include "sokoke.h" + +@@ -558,7 +559,7 @@ "homepage", _("Homepage"), _("The homepage"), - "http://www.google.com", -+ "file:///usr/share/doc/midori/user/midori.html", ++ DEBIAN_DISTRO_DEFAULT_HOMEPAGE, flags)); /** diff --git a/debian/rules b/debian/rules index 04d829ef..eb6c4d37 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,11 @@ %: dh --with quilt $@ +override_dh_quilt_patch: + ln -sf ../debian/config/$(shell lsb_release -is).h midori/midori-debian.h + test -e midori/midori-debian.h + dh_quilt_patch + override_dh_auto_clean: ./waf --nocache distclean rm -rf _build_