[DRE-maint] Ubuntu (new upstream) ruby-gnome2 0.17.0~rc1-6ubuntu1

Ubuntu Merge-o-Matic mom at ubuntu.com
Tue Oct 7 17:59:12 UTC 2008


This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes.  It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
-------------- next part --------------
Format: 1.7
Date: Fri, 26 Sep 2008 11:31:59 +0200
Source: ruby-gnome2
Binary: libpango1-ruby1.8 libatk1-ruby libgtk2-ruby1.8 libgnome2-ruby1.8 libpanel-applet2-ruby libgnomecanvas2-ruby1.8 libgnomecanvas2-ruby libgdk-pixbuf2-ruby1.8 libglib2-ruby1.8 libglade2-ruby1.8 libglade2-ruby libart2-ruby libpango1-ruby libgda-ruby libgconf2-ruby libgtkglext1-ruby libgtkhtml2-ruby1.8 libgtksourceview1-ruby1.8 libgconf2-ruby1.8 libgnomeprintui2-ruby1.8 libgst-ruby libgtkhtml2-ruby libgtk-mozembed-ruby libgtksourceview1-ruby libgnomevfs2-ruby ruby-gnome2 libgnomevfs2-ruby1.8 libgda-ruby1.8 libgnome2-ruby libglib2-ruby libart2-ruby1.8 librsvg2-ruby libgst-ruby1.8 libpanel-applet2-ruby1.8 libgnomeprintui2-ruby libvte-ruby libgtk2-ruby libgnomeprint2-ruby libvte-ruby1.8 librsvg2-ruby1.8 libgtk-mozembed-ruby1.8 libgdk-pixbuf2-ruby libatk1-ruby1.8 libpoppler-glib-ruby1.8 libpoppler-glib-ruby libgnomeprint2-ruby1.8 libgtkglext1-ruby1.8
Architecture: source
Version: 0.17.0~rc1-6ubuntu1
Distribution: intrepid
Urgency: low
Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
Changed-By: Cesare Tirabassi <norsetto at ubuntu.com>
Description: 
 libart2-ruby - Libart 2 bindings for the Ruby language
 libart2-ruby1.8 - Libart 2 bindings for the Ruby language
 libatk1-ruby - ATK bindings for the Ruby language
 libatk1-ruby1.8 - ATK bindings for the Ruby language
 libgconf2-ruby - GConf 2 bindings for the Ruby language
 libgconf2-ruby1.8 - GConf 2 bindings for the Ruby language
 libgda-ruby - GNOME Data Access bindings for the Ruby Language
 libgda-ruby1.8 - GNOME Data Access bindings for the Ruby Language
 libgdk-pixbuf2-ruby - Gdk-Pixbuf 2 bindings for the Ruby language
 libgdk-pixbuf2-ruby1.8 - Gdk-Pixbuf 2 bindings for the Ruby language
 libglade2-ruby - Libglade 2 bindings for the Ruby language
 libglade2-ruby1.8 - Libglade 2 bindings for the Ruby language
 libglib2-ruby - Glib 2 bindings for the Ruby language
 libglib2-ruby1.8 - Glib 2 bindings for the Ruby language
 libgnome2-ruby - GNOME 2 bindings for the Ruby language
 libgnome2-ruby1.8 - GNOME 2 bindings for the Ruby language
 libgnomecanvas2-ruby - GNOME Canvas 2 bindings for the Ruby language
 libgnomecanvas2-ruby1.8 - GNOME Canvas 2 bindings for the Ruby language
 libgnomeprint2-ruby - GNOME print bindings for the Ruby language
 libgnomeprint2-ruby1.8 - GNOME print bindings for the Ruby language
 libgnomeprintui2-ruby - GNOME print user interface bindings for the Ruby language
 libgnomeprintui2-ruby1.8 - GNOME print user interface bindings for the Ruby language
 libgnomevfs2-ruby - GNOME VFS 2 bindings for the Ruby language
 libgnomevfs2-ruby1.8 - GNOME VFS 2 bindings for the Ruby language
 libgst-ruby - GStreamer bindings for the Ruby language
 libgst-ruby1.8 - GStreamer bindings for the Ruby language
 libgtk-mozembed-ruby - ruby binding of GtkMozEmbed, gecko renderer
 libgtk-mozembed-ruby1.8 - ruby binding of GtkMozEmbed, gecko renderer
 libgtk2-ruby - GTK+ bindings for the Ruby language
 libgtk2-ruby1.8 - GTK+ bindings for the Ruby language
 libgtkglext1-ruby - GTK+ GL extension bindings for the Ruby language
 libgtkglext1-ruby1.8 - GTK+ GL extension bindings for the Ruby language
 libgtkhtml2-ruby - GtkHTML bindings for the Ruby language
 libgtkhtml2-ruby1.8 - GtkHTML bindings for the Ruby language
 libgtksourceview1-ruby - GtkSourceView bindings for the Ruby language
 libgtksourceview1-ruby1.8 - GtkSourceView bindings for the Ruby language
 libpanel-applet2-ruby - GNOME 2 panel applet library bindings for the Ruby language
 libpanel-applet2-ruby1.8 - GNOME 2 panel applet library bindings for the Ruby language
 libpango1-ruby - Pango bindings for the Ruby language
 libpango1-ruby1.8 - Pango bindings for the Ruby language
 libpoppler-glib-ruby - Ruby bindinds for the libpoppler-glib library
 libpoppler-glib-ruby1.8 - Ruby bindinds for the libpoppler-glib library
 librsvg2-ruby - RSVG renderer bindings for the Ruby language
 librsvg2-ruby1.8 - RSVG renderer bindings for the Ruby language
 libvte-ruby - VTE widget bindings for the Ruby language
 libvte-ruby1.8 - VTE widget bindings for the Ruby language
 ruby-gnome2 - GNOME-related bindings for the Ruby language
Closes: 490305 498558
Changes: 
 ruby-gnome2 (0.17.0~rc1-6ubuntu1) intrepid; urgency=low
 .
   * Merge from debian unstable, remaining changes:
     - Fix FTBFS and Ruby 1.8 undefined symbol error:
       + debian/control:
         add explicit Build-Depends on libjpeg62-dev
       + debian/patches:
         add gtk+r20440.patch: patch from upstream svn commit 3262
         http://ruby-gnome2.svn.sourceforge.net/viewvc/ruby-gnome2/ruby-gnome2 \
              /trunk/gtk/src/rbgtkfilechooser.c?r1=2460&r2=3262
 .
 ruby-gnome2 (0.17.0~rc1-6) unstable; urgency=low
 .
   * Add patch maincontext-value.patch fixes a crash triggered at least by
     kazehakase (Closes: #490305).
   * Add patch holder-free-memory-leak.diff fixes large memory leak (Closes:
     #498558).
Files: 
 05d03d249ff4b2672e817962157e8130 2497 libs optional ruby-gnome2_0.17.0~rc1-6ubuntu1.dsc
 e29f1279006042c24d0c652de08098ca 20889 libs optional ruby-gnome2_0.17.0~rc1-6ubuntu1.diff.gz
Original-Maintainer: Arnaud Cornet <acornet at debian.org>
-------------- next part --------------
diff -pruN 0.17.0~rc1-6/debian/changelog 0.17.0~rc1-6ubuntu1/debian/changelog
--- 0.17.0~rc1-6/debian/changelog	2008-10-07 16:50:35.000000000 +0100
+++ 0.17.0~rc1-6ubuntu1/debian/changelog	2008-10-07 16:50:36.000000000 +0100
@@ -1,3 +1,16 @@
+ruby-gnome2 (0.17.0~rc1-6ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Fix FTBFS and Ruby 1.8 undefined symbol error:
+      + debian/control:
+        add explicit Build-Depends on libjpeg62-dev
+      + debian/patches:
+        add gtk+r20440.patch: patch from upstream svn commit 3262
+        http://ruby-gnome2.svn.sourceforge.net/viewvc/ruby-gnome2/ruby-gnome2 \
+             /trunk/gtk/src/rbgtkfilechooser.c?r1=2460&r2=3262
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Fri, 26 Sep 2008 11:31:59 +0200
+
 ruby-gnome2 (0.17.0~rc1-6) unstable; urgency=low
 
   * Add patch maincontext-value.patch fixes a crash triggered at least by
@@ -7,6 +20,19 @@ ruby-gnome2 (0.17.0~rc1-6) unstable; urg
 
  -- Arnaud Cornet <acornet at debian.org>  Thu, 18 Sep 2008 10:56:46 +0200
 
+ruby-gnome2 (0.17.0~rc1-5ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Fix FTBFS and Ruby 1.8 undefined symbol error:
+      + debian/control:
+        add explicit Build-Depends on libjpeg62-dev
+      + debian/patches:
+        add gtk+r20440.patch: patch from upstream svn commit 3262
+        http://ruby-gnome2.svn.sourceforge.net/viewvc/ruby-gnome2/ruby-gnome2 \
+             /trunk/gtk/src/rbgtkfilechooser.c?r1=2460&r2=3262
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Sun, 07 Sep 2008 12:15:24 +0200
+
 ruby-gnome2 (0.17.0~rc1-5) unstable; urgency=low
 
   * Add patch destroy-object-on-weak-notify.diff (Closes: #493063).
@@ -14,6 +40,19 @@ ruby-gnome2 (0.17.0~rc1-5) unstable; urg
 
  -- Arnaud Cornet <acornet at debian.org>  Tue, 26 Aug 2008 23:11:02 +0200
 
+ruby-gnome2 (0.17.0~rc1-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Fix FTBFS and Ruby 1.8 undefined symbol error:
+      + debian/control:
+        add explicit Build-Depends on libjpeg62-dev
+      + debian/patches:
+        add gtk+r20440.patch: in gtk+ commit 20440 GtkFileSystemError and
+        gtk_file_system_error_quark have been removed:
+        http://mail.gnome.org/archives/svn-commits-list/2008-June/msg04258.html
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Fri, 29 Aug 2008 12:18:12 +0200
+
 ruby-gnome2 (0.17.0~rc1-4) unstable; urgency=low
 
   [ Paul van Tilburg ]
@@ -27,6 +66,19 @@ ruby-gnome2 (0.17.0~rc1-4) unstable; urg
 
  -- Arnaud Cornet <acornet at debian.org>  Tue, 26 Aug 2008 22:55:28 +0200
 
+ruby-gnome2 (0.17.0~rc1-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Fix FTBFS and Ruby 1.8 undefined symbol error:
+      + debian/control:
+        add explicit Build-Depends on libjpeg62-dev
+      + debian/patches:
+        add gtk+r20440.patch: in gtk+ commit 20440 GtkFileSystemError and
+        gtk_file_system_error_quark have been removed:
+        http://mail.gnome.org/archives/svn-commits-list/2008-June/msg04258.html
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Wed, 23 Jul 2008 18:56:24 +0200
+
 ruby-gnome2 (0.17.0~rc1-3) unstable; urgency=low
 
   * Install rbgcompat.h in libglib2-ruby1.8 (Closes: #489088).
@@ -40,6 +92,18 @@ ruby-gnome2 (0.17.0~rc1-2) unstable; urg
 
  -- Arnaud Cornet <acornet at debian.org>  Sun, 22 Jun 2008 12:29:45 +0200
 
+ruby-gnome2 (0.17.0~rc1-1ubuntu1) intrepid; urgency=low
+
+  * Fix FTBFS and Ruby 1.8 undefined symbol error (LP: #245955):
+    - debian/control:
+      add explicit Build-Depends on libjpeg62-dev
+    - debian/patches:
+      add gtk+r20440.patch: in gtk+ commit 20440 GtkFileSystemError and
+      gtk_file_system_error_quark have been removed:
+      http://mail.gnome.org/archives/svn-commits-list/2008-June/msg04258.html
+
+ -- Cesare Tirabassi <norsetto at ubuntu.com>  Wed, 23 Jul 2008 11:54:25 +0200
+
 ruby-gnome2 (0.17.0~rc1-1) unstable; urgency=low
 
   * Build-depend on xulrunner-dev instead of libxul-dev.
diff -pruN 0.17.0~rc1-6/debian/control 0.17.0~rc1-6ubuntu1/debian/control
--- 0.17.0~rc1-6/debian/control	2008-10-07 16:50:35.000000000 +0100
+++ 0.17.0~rc1-6ubuntu1/debian/control	2008-10-07 16:50:36.000000000 +0100
@@ -1,9 +1,10 @@
 Source: ruby-gnome2
 Section: libs
 Priority: optional
-Maintainer: Arnaud Cornet <acornet at debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-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: ruby-pkg-tools (>= 0.14), cdbs, debhelper (>= 4), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, quilt, libgda2-dev (>= 1.2.4), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+Build-Depends: ruby-pkg-tools (>= 0.14), cdbs, debhelper (>= 4), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, xulrunner-dev (>= 1.9~b5-4), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, quilt, libgda2-dev (>= 1.2.4), libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libjpeg62-dev
 Standards-Version: 3.7.3
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/ruby-gnome2/trunk/
diff -pruN 0.17.0~rc1-6/debian/patches/gtk+r20440.patch 0.17.0~rc1-6ubuntu1/debian/patches/gtk+r20440.patch
--- 0.17.0~rc1-6/debian/patches/gtk+r20440.patch	1970-01-01 01:00:00.000000000 +0100
+++ 0.17.0~rc1-6ubuntu1/debian/patches/gtk+r20440.patch	2008-10-07 16:50:36.000000000 +0100
@@ -0,0 +1,59 @@
+--- ruby-gnome2/gtk/src/rbgtkfilechooser.c	2007/07/13 16:07:34	2460
++++ ruby-gnome2/gtk/src/rbgtkfilechooser.c	2008/07/23 23:51:22	3262
+@@ -16,9 +16,11 @@
+ 
+ #define _SELF(self) GTK_FILE_CHOOSER(RVAL2GOBJ(self))
+ 
++#ifdef HAVE_GTK_GTKFILESYSTEM_H
+ /* For error handling */
+-#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
+-#include <gtk/gtkfilesystem.h>
++#  define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED
++#  include <gtk/gtkfilesystem.h>
++#endif
+ 
+ static VALUE
+ gslist2ary_free(list)
+@@ -324,7 +326,9 @@
+ #if GTK_CHECK_VERSION(2,4,0)
+ 
+     VALUE gFileCho = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
+-    VALUE fse;
++#ifdef HAVE_GTK_GTKFILESYSTEM_H
++    VALUE eFileSystemError;
++#endif
+ 
+     rb_define_method(gFileCho, "set_action", fcho_set_action, 1);
+     rb_define_method(gFileCho, "action", fcho_get_action, 0);
+@@ -367,14 +371,24 @@
+     /* GtkFileChooserError */
+     G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
+                 GTK_TYPE_FILE_CHOOSER_ERROR);
++
++#ifdef HAVE_GTK_GTKFILESYSTEM_H
+     /* GtkFileSystemError */
+-    fse = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError", mGtk, rb_eRuntimeError);
+-    rb_define_const(fse, "NONEXISTENT", INT2NUM(GTK_FILE_SYSTEM_ERROR_NONEXISTENT));
+-    rb_define_const(fse, "NOT_FOLDER", INT2NUM(GTK_FILE_SYSTEM_ERROR_NOT_FOLDER));
+-    rb_define_const(fse, "INVALID_URI", INT2NUM(GTK_FILE_SYSTEM_ERROR_INVALID_URI));
+-    rb_define_const(fse, "BAD_FILENAME", INT2NUM(GTK_FILE_SYSTEM_ERROR_BAD_FILENAME));
+-    rb_define_const(fse, "FAILED", INT2NUM(GTK_FILE_SYSTEM_ERROR_FAILED));
+-    rb_define_const(fse, "ALREADY_EXSITS", INT2NUM(GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS));
++    eFileSystemError = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError",
++				    mGtk, rb_eRuntimeError);
++    rb_define_const(eFileSystemError, "NONEXISTENT",
++		    INT2NUM(GTK_FILE_SYSTEM_ERROR_NONEXISTENT));
++    rb_define_const(eFileSystemError, "NOT_FOLDER",
++		    INT2NUM(GTK_FILE_SYSTEM_ERROR_NOT_FOLDER));
++    rb_define_const(eFileSystemError, "INVALID_URI",
++		    INT2NUM(GTK_FILE_SYSTEM_ERROR_INVALID_URI));
++    rb_define_const(eFileSystemError, "BAD_FILENAME",
++		    INT2NUM(GTK_FILE_SYSTEM_ERROR_BAD_FILENAME));
++    rb_define_const(eFileSystemError, "FAILED",
++		    INT2NUM(GTK_FILE_SYSTEM_ERROR_FAILED));
++    rb_define_const(eFileSystemError, "ALREADY_EXSITS",
++		    INT2NUM(GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS));
++#endif
+ 
+ #if GTK_CHECK_VERSION(2,8,0)
+     /* GtkFileChooserConfirmation */
diff -pruN 0.17.0~rc1-6/debian/patches/series 0.17.0~rc1-6ubuntu1/debian/patches/series
--- 0.17.0~rc1-6/debian/patches/series	2008-10-07 16:50:35.000000000 +0100
+++ 0.17.0~rc1-6ubuntu1/debian/patches/series	2008-10-07 16:50:36.000000000 +0100
@@ -5,7 +5,8 @@ shebangs.patch
 gtkmozembed-rpath.patch
 xulrunner-1.9.patch
 buildsys-abort-on-error.patch
+gtk+r20440.patch
 fix-object-allocation-during-gc-phase.patch
 destroy-object-on-weak-notify.diff
 maincontext-value.patch
-holder-free-memory-leak.diff 
+holder-free-memory-leak.diff


More information about the Pkg-ruby-extras-maintainers mailing list