Dear maintainer,

I've prepared an NMU for google-gadgets (versioned as 0.10.5-0.3) and
uploaded it to unstable.

Cheers,

Mike
diff -u google-gadgets-0.10.5/debian/changelog google-gadgets-0.10.5/debian/changelog
--- google-gadgets-0.10.5/debian/changelog
+++ google-gadgets-0.10.5/debian/changelog
@@ -1,3 +1,14 @@
+google-gadgets (0.10.5-0.3) unstable; urgency=low
+
+  * Non-maintainer upload for transition to xulrunner 1.9.1.
+    (Closes: #548677)
+  * debian/rules: Use dh_xulrunner
+  * debian/control: Build-depend on a xulrunner-dev that provides dh_xulrunner.
+  * debian/patches/03_GRE_Version.patch: Tighten the GREVersionRange.
+  * debian/patches/series: Add 03_GRE_Version.patch.
+
+ -- Mike Hommey <gland...@debian.org>  Sat, 10 Oct 2009 16:08:37 +0200
+
 google-gadgets (0.10.5-0.2) unstable; urgency=low
 
   * NMU.
diff -u google-gadgets-0.10.5/debian/rules google-gadgets-0.10.5/debian/rules
--- google-gadgets-0.10.5/debian/rules
+++ google-gadgets-0.10.5/debian/rules
@@ -79,6 +79,7 @@
 	dh_makeshlibs -V -Ngoogle-gadgets-common -Ngoogle-gadgets-gtk \
 	-Ngoogle-gadgets-qt -Ngoogle-gadgets-gst -Ngoogle-gadgets-xul
 	dh_shlibdeps
+	dh_xulrunner
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
diff -u google-gadgets-0.10.5/debian/control google-gadgets-0.10.5/debian/control
--- google-gadgets-0.10.5/debian/control
+++ google-gadgets-0.10.5/debian/control
@@ -5,7 +5,7 @@
 Build-Depends: debhelper (>= 5), zlib1g-dev, libgtk2.0-dev, zip, chrpath, quilt (>= 0.46-7~),
  libxml2-dev, libdbus-1-dev, librsvg2-dev, libqt4-dev, libltdl3-dev,
  libcurl4-gnutls-dev | libcurl4-openssl-dev, libgstreamer-plugins-base0.10-dev, 
- xulrunner-dev | xulrunner-1.9-dev, network-manager-dev [!kfreebsd-amd64 !kfreebsd-i386], 
+ xulrunner-dev (>= 1.9.1.3-2), network-manager-dev [!kfreebsd-amd64 !kfreebsd-i386], 
  libstartup-notification0-dev
 Standards-Version: 3.8.0
 Vcs-Svn: http://google-gadgets-for-linux.googlecode.com/svn/trunk/packaging/debian
diff -u google-gadgets-0.10.5/debian/patches/series google-gadgets-0.10.5/debian/patches/series
--- google-gadgets-0.10.5/debian/patches/series
+++ google-gadgets-0.10.5/debian/patches/series
@@ -2,2 +2,3 @@
 02_kfreebsd.patch
+03_GRE_Version.patch
 99_relibtoolize.patch
only in patch2:
unchanged:
--- google-gadgets-0.10.5.orig/debian/patches/03_GRE_Version.patch
+++ google-gadgets-0.10.5/debian/patches/03_GRE_Version.patch
@@ -0,0 +1,28 @@
+diff -ruN google-gadgets-0.10.5/extensions/gtkmoz_browser_element/browser_child.cc google-gadgets-0.10.5.new/extensions/gtkmoz_browser_element/browser_child.cc
+--- google-gadgets-0.10.5/extensions/gtkmoz_browser_element/browser_child.cc
++++ google-gadgets-0.10.5.new/extensions/gtkmoz_browser_element/browser_child.cc
+@@ -1172,8 +1172,8 @@
+   nsresult rv;
+ 
+   static const GREVersionRange kGREVersion = {
+-    "1.9a", PR_TRUE,
+-    "1.9.0.*", PR_TRUE
++    "1.9.1", PR_TRUE,
++    "1.9.2", PR_FALSE
+   };
+ 
+   char xpcom_location[4096];
+diff -ruN google-gadgets-0.10.5/extensions/smjs_script_runtime/libmozjs_glue.cc google-gadgets-0.10.5.new/extensions/smjs_script_runtime/libmozjs_glue.cc
+--- google-gadgets-0.10.5/extensions/smjs_script_runtime/libmozjs_glue.cc
++++ google-gadgets-0.10.5.new/extensions/smjs_script_runtime/libmozjs_glue.cc
+@@ -201,8 +201,8 @@
+   char xpcom_file[4096];
+ 
+   static const GREVersionRange kGREVersion = {
+-    "1.9a", PR_TRUE,
+-    "1.9.0.*", PR_TRUE
++    "1.9.1", PR_TRUE,
++    "1.9.2", PR_FALSE
+   };
+ 
+   rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0,

Reply via email to