[DRE-commits] r4259 - in trunk/ruby-gnome2/debian: . patches

[Arnaud Cornet]

Author: acornet
Date: 2009-10-14 20:01:56 +0000 (Wed, 14 Oct 2009)
New Revision: 4259

Added:
   trunk/ruby-gnome2/debian/patches/greversionrange.patch
Modified:
   trunk/ruby-gnome2/debian/changelog
   trunk/ruby-gnome2/debian/control
   trunk/ruby-gnome2/debian/patches/series
   trunk/ruby-gnome2/debian/rules
Log:
Acknowledge NMU

Modified: trunk/ruby-gnome2/debian/changelog
===================================================================
--- trunk/ruby-gnome2/debian/changelog	2009-10-14 13:10:21 UTC (rev 4258)
+++ trunk/ruby-gnome2/debian/changelog	2009-10-14 20:01:56 UTC (rev 4259)
@@ -1,3 +1,21 @@
+ruby-gnome2 (0.19.1-2) UNRELEASED; urgency=low
+
+  * Move glandium's fix of rbgtkmozembed-init.cpp in greversionrange.patch.
+  * NOT RELEASED YET
+
+ -- Arnaud Cornet <acornet at debian.org>  Mon, 24 Aug 2009 00:31:53 +0200
+
+ruby-gnome2 (0.19.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload for transition to xulrunner 1.9.1.
+    (Closes: #548680)
+  * debian/rules: Use dh_xulrunner
+  * debian/control: Build-depend on a xulrunner-dev that provides dh_xulrunner.
+  * gtkmozembed/src/rbgtkmozembed-init.cpp: Tighten the GREVersionRange.
+
+ -- Mike Hommey <glandium at debian.org>  Sat, 10 Oct 2009 16:12:53 +0200
+
+
 ruby-gnome2 (0.19.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #519786, #542126).

Modified: trunk/ruby-gnome2/debian/control
===================================================================
--- trunk/ruby-gnome2/debian/control	2009-10-14 13:10:21 UTC (rev 4258)
+++ trunk/ruby-gnome2/debian/control	2009-10-14 20:01:56 UTC (rev 4259)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Arnaud Cornet <acornet at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <m.schutte.jr at gmail.com>, Antonio Terceiro <terceiro at 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

Added: trunk/ruby-gnome2/debian/patches/greversionrange.patch
===================================================================
--- trunk/ruby-gnome2/debian/patches/greversionrange.patch	                        (rev 0)
+++ trunk/ruby-gnome2/debian/patches/greversionrange.patch	2009-10-14 20:01:56 UTC (rev 4259)
@@ -0,0 +1,15 @@
+Index: ruby-gnome2-0.19.1/gtkmozembed/src/rbgtkmozembed-init.cpp
+===================================================================
+--- ruby-gnome2-0.19.1.orig/gtkmozembed/src/rbgtkmozembed-init.cpp	2009-10-14 21:53:41.437971650 +0200
++++ ruby-gnome2-0.19.1/gtkmozembed/src/rbgtkmozembed-init.cpp	2009-10-14 21:54:03.699652601 +0200
+@@ -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];
+ 

Modified: trunk/ruby-gnome2/debian/patches/series
===================================================================
--- trunk/ruby-gnome2/debian/patches/series	2009-10-14 13:10:21 UTC (rev 4258)
+++ trunk/ruby-gnome2/debian/patches/series	2009-10-14 20:01:56 UTC (rev 4259)
@@ -3,4 +3,5 @@
 extconf-strict.patch
 shebangs.patch
 gtkmozembed-rpath.patch
+greversionrange.patch
 buildsys-abort-on-error.patch

Modified: trunk/ruby-gnome2/debian/rules
===================================================================
--- trunk/ruby-gnome2/debian/rules	2009-10-14 13:10:21 UTC (rev 4258)
+++ trunk/ruby-gnome2/debian/rules	2009-10-14 20:01:56 UTC (rev 4259)
@@ -15,7 +15,7 @@
 		        sitearchdir=$(ruby_archdir_ver)
 
 %:
-	dh $@
+	dh --with xulrunner $@
 
 build: patch
 	dh build