Dear maintainer,
I've prepared an NMU for gnome-python-extras (versioned as 2.25.3-4.1) and
uploaded it to unstable.
Cheers,
Mike
diff -u gnome-python-extras-2.25.3/debian/control gnome-python-extras-2.25.3/debian/control
--- gnome-python-extras-2.25.3/debian/control
+++ gnome-python-extras-2.25.3/debian/control
@@ -12,7 +12,7 @@
libgtk2.0-dev (>= 2.4),
python-gnome2-dev (>= 2.10.0),
libgtkhtml2-dev (>= 2.3.1),
- xulrunner-dev (>= 1.9~rc1),
+ xulrunner-dev (>= 1.9.1.3-2),
libgda-4.0-dev (>= 3.99.11),
libgksu2-dev (>= 2.0.4),
python-gtk2-dev,
@@ -73,7 +73,6 @@
${shlibs:Depends},
${python:Depends},
python-gtk2,
- xulrunner-1.9 (>= 1.9~rc1)
Conflicts: python-gnome2-extras (<< 2.19.1-1),
python-gnome2-extras-doc
Replaces: python-gnome2-extras (<< 2.19.1-1),
diff -u gnome-python-extras-2.25.3/debian/rules gnome-python-extras-2.25.3/debian/rules
--- gnome-python-extras-2.25.3/debian/rules
+++ gnome-python-extras-2.25.3/debian/rules
@@ -111,6 +111,7 @@
dh_pysupport -a
dh_installdeb -a
dh_shlibdeps -a
+ dh_xulrunner -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
diff -u gnome-python-extras-2.25.3/debian/changelog gnome-python-extras-2.25.3/debian/changelog
--- gnome-python-extras-2.25.3/debian/changelog
+++ gnome-python-extras-2.25.3/debian/changelog
@@ -1,3 +1,16 @@
+gnome-python-extras (2.25.3-4.1) unstable; urgency=low
+
+ * Non-maintainer upload for transition to xulrunner 1.9.1.
+ (Closes: #548676)
+ * debian/rules: Use dh_xulrunner.
+ * debian/control, debian/control.in:
+ - Build-depend on a xulrunner-dev that provides dh_xulrunner.
+ - Let dh_xulrunner fill shlibs:Depends with the proper xulrunner
+ dependency.
+ * debian/patches/01_xul19.patch: Tighten the GREVersionRange.
+
+ -- Mike Hommey <gland...@debian.org> Sat, 10 Oct 2009 11:51:32 +0200
+
gnome-python-extras (2.25.3-4) unstable; urgency=low
* 04_gdl_2.28.patch: stolen from upstream. Port to GDL 2.28.
diff -u gnome-python-extras-2.25.3/debian/control.in gnome-python-extras-2.25.3/debian/control.in
--- gnome-python-extras-2.25.3/debian/control.in
+++ gnome-python-extras-2.25.3/debian/control.in
@@ -12,7 +12,7 @@
libgtk2.0-dev (>= 2.4),
python-gnome2-dev (>= 2.10.0),
libgtkhtml2-dev (>= 2.3.1),
- xulrunner-dev (>= 1.9~rc1),
+ xulrunner-dev (>= 1.9.1.3-2),
libgda-4.0-dev (>= 3.99.11),
libgksu2-dev (>= 2.0.4),
python-gtk2-dev,
@@ -73,7 +73,6 @@
${shlibs:Depends},
${python:Depends},
python-gtk2,
- xulrunner-1.9 (>= 1.9~rc1)
Conflicts: python-gnome2-extras (<< 2.19.1-1),
python-gnome2-extras-doc
Replaces: python-gnome2-extras (<< 2.19.1-1),
diff -u gnome-python-extras-2.25.3/debian/patches/01_xul19.patch gnome-python-extras-2.25.3/debian/patches/01_xul19.patch
--- gnome-python-extras-2.25.3/debian/patches/01_xul19.patch
+++ gnome-python-extras-2.25.3/debian/patches/01_xul19.patch
@@ -181,8 +181,8 @@
+
+#ifdef XPCOM_GLUE
+ static const GREVersionRange greVersion = {
-+ "1.9b", PR_TRUE,
-+ "1.9.*", PR_TRUE
++ "1.9.1", PR_TRUE,
++ "1.9.2", PR_FALSE
+ };
+ char xpcomLocation[4096];
+ nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
