Package: google-gadgets-xul Severity: important Tags: patch Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime soonish, so google-gadgets 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 google-gadgets-0.10.5/debian/control google-gadgets-0.10.5.new/debian/control --- google-gadgets-0.10.5/debian/control +++ google-gadgets-0.10.5.new/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 -ruN google-gadgets-0.10.5/debian/patches/03_GRE_Version.patch google-gadgets-0.10.5.new/debian/patches/03_GRE_Version.patch --- google-gadgets-0.10.5/debian/patches/03_GRE_Version.patch +++ google-gadgets-0.10.5.new/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, diff -ruN google-gadgets-0.10.5/debian/patches/series google-gadgets-0.10.5.new/debian/patches/series --- google-gadgets-0.10.5/debian/patches/series +++ google-gadgets-0.10.5.new/debian/patches/series @@ -1,3 +1,4 @@ 01_am_maintainer_mode.patch 02_kfreebsd.patch +03_GRE_Version.patch 99_relibtoolize.patch diff -ruN google-gadgets-0.10.5/debian/rules google-gadgets-0.10.5.new/debian/rules --- google-gadgets-0.10.5/debian/rules +++ google-gadgets-0.10.5.new/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
