Bug#352085: devhelp: Please build against xulrunner when it will reach unstable

[Mike Hommey]

Package: devhelp
Version: 0.11-2
Severity: wishlist
Tags: patch

Hi, attached here is a patch so that devhelp builds against xulrunner
instead of mozilla.

Xulrunner is in the NEW queue at the moment, so I can't say for sure
when it will reach unstable.

Cheers,

Mike

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
-------------- next part --------------
diff -ruN devhelp-0.11.orig/debian/changelog devhelp-0.11/debian/changelog
--- devhelp-0.11.orig/debian/changelog	2006-02-09 10:47:24.444365576 +0100
+++ devhelp-0.11/debian/changelog	2006-02-09 10:21:55.304830120 +0100
@@ -1,3 +1,13 @@
+devhelp (0.11-2.1) unstable; urgency=low
+
+  * Test build with xulrunner.
+  * debian/control, debian/control.in:
+    + Changed Build-deps from mozilla-browser to libxul-dev.
+    + Changed libdevhelp-1-0's dependencies and conflicts accordingly.
+  * debian/rules: Add --with-gecko=xulrunner to the configure line.
+
+ -- Mike Hommey <glandium at debian.org>  Thu,  9 Feb 2006 10:21:44 +0100
+
 devhelp (0.11-2) unstable; urgency=high
 
   [ Gustavo Noronha Silva ]
diff -ruN devhelp-0.11.orig/debian/control devhelp-0.11/debian/control
--- devhelp-0.11.orig/debian/control	2006-02-09 10:47:24.443365728 +0100
+++ devhelp-0.11/debian/control	2006-02-09 10:21:39.136288112 +0100
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Akira TAGOH <tagoh at debian.org>, Andreas Rottmann <rotty at debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Carlos Perell? Mar?n <carlos at pemas.net>, Cl?ment Stenac <zorglub at debian.org>, Ed Boraas <ed at debian.org>, Edd Dumbill <ejad at debian.org>, Emil Soleyman-Zomalan <emil at nishra.com>, Guilherme de S. Pastore <guilherme.pastore at terra.com.br>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Joe Drew <drew at debian.org>, Johannes Rohr <jr.debian at rohr.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Ond?ej Sur? <ondrej at debian.org>, Rob Bradford <rob at debianplanet.org>, Robert McQueen <robot101 at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Takuo KITAME <kitame at debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1.0), libgtk2.0-dev (>= 2.6.0), libglade2-dev (>= 1:2.4.0-1), libgconf2-dev (>= 2.6.0), libwnck-dev (>= 2.10.0), mozilla-dev (>= 2:1.7), libgnomevfs2-dev (>= 2.6.1.1-3), gettext, automake, intltool, gnome-pkg-tools
+Build-Depends: cdbs, debhelper (>> 4.1.0), libgtk2.0-dev (>= 2.6.0), libglade2-dev (>= 1:2.4.0-1), libgconf2-dev (>= 2.6.0), libwnck-dev (>= 2.10.0), libxul-dev, libgnomevfs2-dev (>= 2.6.1.1-3), gettext, automake, intltool, gnome-pkg-tools
 Standards-Version: 3.6.2
 
 Package: libdevhelp-1-0
 Section: libs
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, mozilla-browser (>= 2:1.7), devhelp-common (= ${Source-Version})
-Conflicts: devhelp (<< 0.8.1-1), mozilla-browser (>= 2:1.8)
+Depends: ${misc:Depends}, ${shlibs:Depends}, devhelp-common (= ${Source-Version})
+Conflicts: devhelp (<< 0.8.1-1)
 Replaces: devhelp (<< 0.9-5)
 Description: Library providing documentation browser functionality
  This library provides embedable widgets from the Devhelp program to
diff -ruN devhelp-0.11.orig/debian/control.in devhelp-0.11/debian/control.in
--- devhelp-0.11.orig/debian/control.in	2006-02-09 10:47:24.442365880 +0100
+++ devhelp-0.11/debian/control.in	2006-02-09 10:21:14.960963320 +0100
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs, debhelper (>> 4.1.0), libgtk2.0-dev (>= 2.6.0), libglade2-dev (>= 1:2.4.0-1), libgconf2-dev (>= 2.6.0), libwnck-dev (>= 2.10.0), mozilla-dev (>= 2:1.7), libgnomevfs2-dev (>= 2.6.1.1-3), gettext, automake, intltool, gnome-pkg-tools
+Build-Depends: cdbs, debhelper (>> 4.1.0), libgtk2.0-dev (>= 2.6.0), libglade2-dev (>= 1:2.4.0-1), libgconf2-dev (>= 2.6.0), libwnck-dev (>= 2.10.0), libxul-dev, libgnomevfs2-dev (>= 2.6.1.1-3), gettext, automake, intltool, gnome-pkg-tools
 Standards-Version: 3.6.2
 
 Package: libdevhelp-1-0
 Section: libs
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, mozilla-browser (>= 2:1.7), devhelp-common (= ${Source-Version})
-Conflicts: devhelp (<< 0.8.1-1), mozilla-browser (>= 2:1.8)
+Depends: ${misc:Depends}, ${shlibs:Depends}, devhelp-common (= ${Source-Version})
+Conflicts: devhelp (<< 0.8.1-1)
 Replaces: devhelp (<< 0.9-5)
 Description: Library providing documentation browser functionality
  This library provides embedable widgets from the Devhelp program to
diff -ruN devhelp-0.11.orig/debian/rules devhelp-0.11/debian/rules
--- devhelp-0.11.orig/debian/rules	2006-02-09 10:47:24.444365576 +0100
+++ devhelp-0.11/debian/rules	2006-02-09 10:20:12.355480800 +0100
@@ -9,7 +9,7 @@
 VERSION=$(shell head -1 debian/changelog | cut -d '(' -f 2 | cut -d ')' -f 1)
 
 DEB_INSTALL_MANPAGES_devhelp := debian/devhelp.1
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-install-schemas
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-install-schemas --with-gecko=xulrunner
 
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR)