Here is the same patch applied to 0.3.7-1. Please apply it.

Mike
diff -ruN kazehakase-0.3.7.orig/debian/changelog 
kazehakase-0.3.7/debian/changelog
--- kazehakase-0.3.7.orig/debian/changelog      2006-06-05 11:58:31.000000000 
+0200
+++ kazehakase-0.3.7/debian/changelog   2006-06-05 11:57:45.062948928 +0200
@@ -1,3 +1,16 @@
+kazehakase (0.3.7-1.1) unstable; urgency=low
+
+  * Test build with xulrunner.
+  * debian/control:
+    + Changed Build-deps from mozilla-browser to libxul-dev.
+    + Changed kazehakase's dependencies accordingly.
+  * debian/rules: Add --with-gecko-engine=xulrunner to the configure line.
+  * debian/patches/40_xulrunner.dpatch: Patch to support building against
+    xulrunner.
+  * debian/patches/00list: Updated accordingly.
+
+ -- Mike Hommey <[EMAIL PROTECTED]>  Thu,  9 Feb 2006 09:13:50 +0100
+
 kazehakase (0.3.7-1) unstable; urgency=low
 
   * New upstream release
diff -ruN kazehakase-0.3.7.orig/debian/control kazehakase-0.3.7/debian/control
--- kazehakase-0.3.7.orig/debian/control        2006-06-05 11:58:31.000000000 
+0200
+++ kazehakase-0.3.7/debian/control     2006-06-05 11:55:51.908151072 +0200
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Hidetaka Iwai <[EMAIL PROTECTED]>
-Build-Depends: automake1.7, libtool, debhelper(>> 4.0.0), dpatch, 
libatk1.0-dev, libglib2.0-dev, libgtk2.0-dev, libpango1.0-dev, mozilla-dev (>= 
2:1.7.12), mozilla-dev (<< 2:1.7.13), libgnutls-dev (>= 1.2.6), ruby (>=1.8.0), 
ruby(<< 1.9.0), ruby1.8-dev, libgtk2-ruby, libgettext-ruby1.8
+Build-Depends: automake1.7, libtool, debhelper(>> 4.0.0), dpatch, 
libatk1.0-dev, libglib2.0-dev, libgtk2.0-dev, libpango1.0-dev, libxul-dev, 
libgnutls-dev (>= 1.2.6), ruby (>=1.8.0), ruby(<< 1.9.0), ruby1.8-dev, 
libgtk2-ruby, libgettext-ruby1.8
 Standards-Version: 3.6.2
 
 Package: kazehakase
@@ -10,7 +10,7 @@
 Suggests: migemo
 Recommends: hyperestraier
 Provides: www-browser
-Depends: ${shlibs:Depends}, mozilla-browser (>= 2:1.7.12), mozilla-browser (<< 
2:1.7.13), ruby (>= 1.8.0), ruby (<< 1.9.0), libgtk2-ruby, libgettext-ruby1.8
+Depends: ${shlibs:Depends}, ruby (>= 1.8.0), ruby (<< 1.9.0), libgtk2-ruby, 
libgettext-ruby1.8
 Conflicts: kazehakase-migemo
 Description: gecko based web browser using GTK
  Kazehakase is a web browser using Gecko as HTML rendering engine.
diff -ruN kazehakase-0.3.7.orig/debian/patches/00list 
kazehakase-0.3.7/debian/patches/00list
--- kazehakase-0.3.7.orig/debian/patches/00list 2006-06-05 11:58:31.000000000 
+0200
+++ kazehakase-0.3.7/debian/patches/00list      2006-06-05 11:54:55.693696968 
+0200
@@ -1,3 +1,4 @@
 05_add_missing
 20_user_agent_tag
 30_bookmarkbar_DSA
+40_xulrunner
diff -ruN kazehakase-0.3.7.orig/debian/patches/40_xulrunner.dpatch 
kazehakase-0.3.7/debian/patches/40_xulrunner.dpatch
--- kazehakase-0.3.7.orig/debian/patches/40_xulrunner.dpatch    1970-01-01 
01:00:00.000000000 +0100
+++ kazehakase-0.3.7/debian/patches/40_xulrunner.dpatch 2006-06-05 
11:54:55.694696816 +0200
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_xulrunner.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow to build against xulrunner
+
[EMAIL PROTECTED]@
+
+--- kazehakase-0.3.4.orig/configure    2006-02-09 09:15:48.065942104 +0100
++++ kazehakase-0.3.4/configure 2006-02-09 09:10:49.613313800 +0100
+@@ -1072,7 +1072,7 @@
+                           both]
+   --with-tags[=TAGS]
+                           include additional configurations [automatic]
+-  --with-gecko-engine[=mozilla|firefox|thunderbird|seamonkey]
++  --with-gecko-engine[=mozilla|firefox|thunderbird|seamonkey|xulrunner]
+                           Whether to use mozilla, firefox or thunderbird or
+                           seamonkey xpcom (default: mozilla)
+   --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)
+@@ -20487,12 +20487,14 @@
+     GECKO=seamonkey
+   elif $PKG_CONFIG --exists thunderbird-xpcom; then
+     GECKO=thunderbird
++  elif $PKG_CONFIG --exists xulrunner-xpcom; then
++    GECKO=xulrunner
+   else
+     { { echo "$as_me:$LINENO: error: no mozilla installation found" >&5
+ echo "$as_me: error: no mozilla installation found" >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+-elif test "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != 
"xfirefox" -a "x$with_gecko_engine" != "xthunderbird" -a "x$with_gecko_engine" 
!= "xseamonkey" -a "x$with_gecko_engine" != "xmozilla-firefox"; then
++elif test "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != 
"xfirefox" -a "x$with_gecko_engine" != "xthunderbird" -a "x$with_gecko_engine" 
!= "xseamonkey" -a "x$with_gecko_engine" != "xmozilla-firefox" -a 
"x$with_gecko_engine" != "xxulrunner"; then
+   { { echo "$as_me:$LINENO: error: unknown gecko engine name ($GECKO)" >&5
+ echo "$as_me: error: unknown gecko engine name ($GECKO)" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -20508,6 +20510,7 @@
+ firefox) min_version=1.0 flavour=toolkit ;;
+ mozilla-firefox) min_version=1.0 flavour=toolkit ;;
+ thunderbird) min_version=0.8 flavour=toolkit ;;
++xulrunner) min_version=1.8 flavour=toolkit ;;
+ esac
+ 
+ GECKO_FLAVOUR=$flavour
+--- kazehakase-0.3.4.orig/configure.in 2006-01-22 10:36:14.000000000 +0100
++++ kazehakase-0.3.4/configure.in      2006-02-09 09:10:42.692365944 +0100
+@@ -33,7 +33,7 @@
+ dnl **************************************************************
+ GECKO=
+ AC_ARG_WITH([gecko_engine],
+-      
AS_HELP_STRING([--with-gecko-engine@<:@=mozilla|firefox|thunderbird|seamonkey@:>@],
++      
AS_HELP_STRING([--with-gecko-engine@<:@=mozilla|firefox|thunderbird|seamonkey|xulrunner@:>@],
+                      [Whether to use mozilla, firefox or thunderbird or 
seamonkey xpcom (default: mozilla)]),
+       [GECKO="$withval"])
+ 
+@@ -49,10 +49,12 @@
+     GECKO=seamonkey
+   elif $PKG_CONFIG --exists thunderbird-xpcom; then
+     GECKO=thunderbird
++  elif $PKG_CONFIG --exists xulrunner-xpcom; then
++    GECKO=xulrunner
+   else
+     AC_MSG_ERROR([no mozilla installation found])
+   fi
+-elif test "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != 
"xfirefox" -a "x$with_gecko_engine" != "xthunderbird" -a "x$with_gecko_engine" 
!= "xseamonkey" -a "x$with_gecko_engine" != "xmozilla-firefox"; then
++elif test "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != 
"xfirefox" -a "x$with_gecko_engine" != "xthunderbird" -a "x$with_gecko_engine" 
!= "xseamonkey" -a "x$with_gecko_engine" != "xmozilla-firefox" -a 
"x$with_gecko_engine" != "xxulrunner"; then
+   AC_MSG_ERROR([unknown gecko engine name ($GECKO)])
+ fi
+ AC_SUBST(GECKO)
+@@ -65,6 +67,7 @@
+ firefox) min_version=1.0 flavour=toolkit ;;
+ mozilla-firefox) min_version=1.0 flavour=toolkit ;;
+ thunderbird) min_version=0.8 flavour=toolkit ;;
++xulrunner) min_version=1.8 flavour=toolkit ;;
+ esac
+ 
+ GECKO_FLAVOUR=$flavour
diff -ruN kazehakase-0.3.7.orig/debian/rules kazehakase-0.3.7/debian/rules
--- kazehakase-0.3.7.orig/debian/rules  2006-06-05 11:58:31.000000000 +0200
+++ kazehakase-0.3.7/debian/rules       2006-06-05 11:56:30.920220336 +0200
@@ -50,7 +50,7 @@
        dh_testdir
        chmod +x ./configure
        chmod +x ./mkinstalldirs
-       $(COMPILER_FLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --enable-migemo --prefix=/usr 
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
--sysconfdir=/etc 
+       $(COMPILER_FLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --enable-migemo --prefix=/usr 
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info 
--sysconfdir=/etc --with-gecko-engine=xulrunner
 
 build: build-stamp 
 build-stamp: patch config.status 

Reply via email to