Package: libgtk-mozembed-ruby
Severity: important
Tags: patch

Xulrunner 1.9.1 is going to replace xulrunner 1.9 in unstable sometime
soonish, so ruby-gnome2 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 ruby-gnome2-0.19.1/debian/control ruby-gnome2-0.19.1.new/debian/control
--- ruby-gnome2-0.19.1/debian/control
+++ ruby-gnome2-0.19.1.new/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Arnaud Cornet <acor...@debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintain...@lists.alioth.debian.org>, Paul van Tilburg <pau...@debian.org>, Michael Schutte <m.schutte...@gmail.com>, Antonio Terceiro <terce...@softwarelivre.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libpanel-applet2-dev, librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev, libdrm-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libpanel-applet2-dev, librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9.1.3-2), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgoocanvas-dev (>= 0.8.0), libgtksourceview2.0-dev, libdrm-dev
 Standards-Version: 3.8.3
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/ruby-gnome2/
@@ -593,7 +593,7 @@
 
 Package: libgtk-mozembed-ruby1.8
 Architecture: any
-Depends: ${shlibs:Depends}, libgtk2-ruby1.8, xulrunner-1.9 (>= 1.9~b5-4), ${misc:Depends}
+Depends: ${shlibs:Depends}, libgtk2-ruby1.8, ${misc:Depends}
 Replaces: libgtk-mozembed-ruby (<< 0.16.0)
 Conflicts: libgtk-mozembed-ruby (<< 0.16.0)
 Description: ruby binding of GtkMozEmbed, gecko renderer
diff -ruN ruby-gnome2-0.19.1/debian/rules ruby-gnome2-0.19.1.new/debian/rules
--- ruby-gnome2-0.19.1/debian/rules
+++ ruby-gnome2-0.19.1.new/debian/rules
@@ -15,7 +15,7 @@
 		        sitearchdir=$(ruby_archdir_ver)
 
 %:
-	dh $@
+	dh --with xulrunner $@
 
 build: patch
 	dh build
diff -ruN ruby-gnome2-0.19.1/gtkmozembed/src/rbgtkmozembed-init.cpp ruby-gnome2-0.19.1.new/gtkmozembed/src/rbgtkmozembed-init.cpp
--- ruby-gnome2-0.19.1/gtkmozembed/src/rbgtkmozembed-init.cpp
+++ ruby-gnome2-0.19.1.new/gtkmozembed/src/rbgtkmozembed-init.cpp
@@ -35,8 +35,8 @@
 setup_xpcom_glue(void)
 {
     static const GREVersionRange greVersion = {
-	"1.9b", PR_TRUE,
-	"2", PR_TRUE
+	"1.9.1", PR_TRUE,
+	"1.9.2", PR_FALSE
     };
     char xpcomPath[PATH_MAX];
 

Reply via email to