Bug#550041: xiphos: diff for NMU version 3.1.1-2.1

[Mike Hommey]

Dear maintainer,

I've prepared an NMU for xiphos (versioned as 3.1.1-2.1) and
uploaded it to unstable.

Cheers,

Mike

diff -u xiphos-3.1.1/debian/control xiphos-3.1.1/debian/control
--- xiphos-3.1.1/debian/control
+++ xiphos-3.1.1/debian/control
@@ -4,7 +4,6 @@
                quilt,
                debhelper (>= 7.0.50~),
                libsword-dev (>=1.5.11),
-               gnome-spell,
                scrollkeeper,
                libgtkhtml3.14-dev,
                libgtkhtml-editor-dev | gtkhtml3.14,
@@ -12,7 +11,8 @@
                intltool,
                libatspi-dev,
                libgnome2-dev,
-               xulrunner-dev | libxul-dev,
+               libglade2-dev,
+               xulrunner-dev (>= 1.9.1.3-2),
                libmagick++-dev,
                libcurl4-gnutls-dev,
                libicu-dev,
diff -u xiphos-3.1.1/debian/rules xiphos-3.1.1/debian/rules
--- xiphos-3.1.1/debian/rules
+++ xiphos-3.1.1/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:
diff -u xiphos-3.1.1/debian/changelog xiphos-3.1.1/debian/changelog
--- xiphos-3.1.1/debian/changelog
+++ xiphos-3.1.1/debian/changelog
@@ -1,3 +1,21 @@
+xiphos (3.1.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload for transition to xulrunner 1.9.1.
+    (Closes: #548682)
+  * debian/rules: Use dh_xulrunner
+  * debian/control:
+    - Build-depend on a xulrunner-dev that provides dh_xulrunner.
+    - Build-depend on libglade2-dev. (Closes: #549788)
+    - Don't build-depend on gnome-spell (Closes: #549084)
+  * debian/patches/gre_version.patch: Tighten the GREVersionRange.
+  * debian/patches/series: Added gre_version.patch.
+  * Rebuilding will get the proper libgtkhtml-editor0 dependencies.
+    (Closes: #550301)
+  * Getting proper dependencies from dh_xulrunner, and tightening
+    GREVersionRange should avoid segfault at startup. (Closes: #550041)
+
+ -- Mike Hommey <gland...@debian.org>  Sat, 10 Oct 2009 18:49:57 +0200
+
 xiphos (3.1.1-2) unstable; urgency=high
 
   * debian/control:
diff -u xiphos-3.1.1/debian/patches/series xiphos-3.1.1/debian/patches/series
--- xiphos-3.1.1/debian/patches/series
+++ xiphos-3.1.1/debian/patches/series
@@ -1,3 +1,4 @@
+gre_version.patch
 ignone-desktop.in.patch
 remove-obsolete-potfile.patch
 remove-extra-licenses.patch
only in patch2:
unchanged:
--- xiphos-3.1.1.orig/debian/patches/gre_version.patch
+++ xiphos-3.1.1/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));