Package: xiphos
Severity: important
Tags: patch
Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime
soonish, so xiphos 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
diff -ruN xiphos-3.1.1/debian/control xiphos-3.1.1.new/debian/control
--- xiphos-3.1.1/debian/control
+++ xiphos-3.1.1.new/debian/control
@@ -12,7 +12,7 @@
intltool,
libatspi-dev,
libgnome2-dev,
- xulrunner-dev | libxul-dev,
+ xulrunner-dev (>= 1.9.1.3-2),
libmagick++-dev,
libcurl4-gnutls-dev,
libicu-dev,
diff -ruN xiphos-3.1.1/debian/patches/gre_version.patch xiphos-3.1.1.new/debian/patches/gre_version.patch
--- xiphos-3.1.1/debian/patches/gre_version.patch
+++ xiphos-3.1.1.new/debian/patches/gre_version.patch
@@ -0,0 +1,14 @@
+diff -ruN xiphos-3.1.1/src/gecko/gecko-utils.cpp xiphos-3.1.1.new/src/gecko/gecko-utils.cpp
+--- xiphos-3.1.1/src/gecko/gecko-utils.cpp
++++ xiphos-3.1.1.new/src/gecko/gecko-utils.cpp
+@@ -232,8 +232,8 @@
+ nsresult rv;
+ #ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
+- "1.9a", PR_TRUE,
+- "2", PR_TRUE
++ "1.9.1", PR_TRUE,
++ "1.9.2", PR_FALSE
+ };
+ char xpcomLocation[PATH_MAX];
+ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation));
diff -ruN xiphos-3.1.1/debian/patches/series xiphos-3.1.1.new/debian/patches/series
--- xiphos-3.1.1/debian/patches/series
+++ xiphos-3.1.1.new/debian/patches/series
@@ -1,3 +1,4 @@
+gre_version.patch
ignone-desktop.in.patch
remove-obsolete-potfile.patch
remove-extra-licenses.patch
diff -ruN xiphos-3.1.1/debian/rules xiphos-3.1.1.new/debian/rules
--- xiphos-3.1.1/debian/rules
+++ xiphos-3.1.1.new/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
%:
- dh --with quilt $@
+ dh --with quilt,xulrunner $@
# because check target is broken
override_dh_auto_test:
