Package: galeon
Version: 2.0.7-1
Severity: important
Tags: patch
Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime
soonish, so galeon should switch to using it.
As a matter of being future-proof, a dh_xulrunner program has been added
to xulrunner-dev, that will add the proper dependency to shlibs:Depends.
Please note that the package supporting this command is not yet in the
archive and should reach experimental some time today.
The attached patch implements the necessary changes[1], please upload to
unstable as soon as possible. The package will then be dep-wait, and will
get built as soon as xulrunner 1.9.1 reaches unstable, which will happen
when all the changes required on other packages will be ready.
Cheers,
Mike
1. Please note that this patch still hardcodes the GREVersionRange, which
is not really future-proof. Something similar to what exists in chmsee would
be required for that.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages galeon depends on:
ii galeon-common 2.0.7-1 data for the galeon web browser
ii gconf2 2.26.2-3 GNOME configuration database syste
ii libbonobo2-0 2.24.2-1 Bonobo CORBA interfaces library
ii libbonoboui2-0 2.24.2-1 The Bonobo UI library
ii libc6 2.9-26 GNU C Library: Shared libraries
ii libgcc1 1:4.4.1-4 GCC support library
ii libgconf2-4 2.26.2-3 GNOME configuration database syste
ii libglade2-0 1:2.6.4-1 library to load .glade files at ru
ii libglib2.0-0 2.22.0-1 The GLib library of C routines
ii libgnome-desktop-2-11 2.26.1-1 Utility library for loading .deskt
ii libgnome2-0 2.26.0-1 The GNOME library - runtime files
ii libgnomeui-0 2.24.2-1 The GNOME libraries (User Interfac
ii libgnomevfs2-0 1:2.24.1-4 GNOME Virtual File System (runtime
ii libgtk2.0-0 2.18.0-1 The GTK+ graphical user interface
ii libnspr4-0d 4.8-1 NetScape Portable Runtime Library
ii liborbit2 1:2.14.17-0.1 libraries for ORBit2 - a CORBA ORB
ii libpango1.0-0 1.26.0-1 Layout and rendering of internatio
ii libpopt0 1.14-4 lib for parsing cmdline parameters
ii libstdc++6 4.4.1-4 The GNU Standard C++ Library v3
ii libx11-6 2:1.2.2-1 X11 client-side library
ii libxml2 2.7.5.dfsg-1 GNOME XML library
ii procps 1:3.2.8-1.1 /proc file system utilities
ii xulrunner-1.9 1.9.0.14-1 XUL + XPCOM application runner
Versions of packages galeon recommends:
ii gnome-control-center 1:2.26.0-1 utilities to configure the GNOME d
ii gnome-icon-theme 2.26.0-1 GNOME Desktop icon theme
ii iso-codes 3.10.3-1 ISO language, territory, currency,
ii rarian-compat [scrollkee 0.8.1-4 Documentation meta-data library (c
ii yelp 2.28.0+webkit-1 Help browser for GNOME
Versions of packages galeon suggests:
pn mozplugger <none> (no description available)
-- no debconf information
diff -ruN galeon-2.0.7/debian/control galeon-2.0.7.new/debian/control
--- galeon-2.0.7/debian/control 2009-09-17 16:30:53.000000000 +0200
+++ galeon-2.0.7.new/debian/control 2009-09-17 16:36:11.310576520 +0200
@@ -18,7 +18,7 @@
libgnome-desktop-dev (>= 2.10),
libgtk2.0-dev,
liborbit2-dev,
- xulrunner-dev (>= 1.9~) | xulrunner-1.9-dev,
+ xulrunner-dev (>= 1.9.1.3-2)
libnspr4-dev,
iso-codes,
intltool,
@@ -36,7 +36,6 @@
${shlibs:Depends},
procps,
galeon-common,
- xulrunner (>= 1.9~) | xulrunner-1.9
Recommends: gnome-icon-theme (>= 1.1.3-1),
yelp,
scrollkeeper,
diff -ruN galeon-2.0.7/debian/patches/80_GRE_version.patch galeon-2.0.7.new/debian/patches/80_GRE_version.patch
--- galeon-2.0.7/debian/patches/80_GRE_version.patch 1970-01-01 01:00:00.000000000 +0100
+++ galeon-2.0.7.new/debian/patches/80_GRE_version.patch 2009-09-17 16:34:32.615238461 +0200
@@ -0,0 +1,14 @@
+diff -ruN galeon-2.0.7/mozilla/mozilla-embed-shell.cpp galeon-2.0.7.new/mozilla/mozilla-embed-shell.cpp
+--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp
++++ galeon-2.0.7.new/mozilla/mozilla-embed-shell.cpp
+@@ -331,8 +331,8 @@
+ nsresult rv;
+ #ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+- "1.9a", PR_TRUE,
+- "1.9.*", PR_TRUE
++ "1.9.1", PR_TRUE,
++ "1.9.2", PR_FALSE
+ };
+ char xpcomLocation[4096];
+ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
diff -ruN galeon-2.0.7/debian/rules galeon-2.0.7.new/debian/rules
--- galeon-2.0.7/debian/rules 2009-09-17 16:30:53.000000000 +0200
+++ galeon-2.0.7.new/debian/rules 2009-09-17 16:35:33.565490263 +0200
@@ -27,3 +27,5 @@
$$i; \
done
+build-install/galeon::
+ dh_xulrunner -pgaleon
