[DRE-commits] [SCM] ruby-gnome2.git branch, master, updated. 9c70179b2e72b23904b9b3767359bdc64d4f78f4

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit a9649eb577baf555b7380b16af3316b9fd8e89f2
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Mon Jul 25 23:24:12 2011 -0700

    Drop gtkmozembed packages

diff --git a/debian/changelog b/debian/changelog
index 5584ee6..6bcc924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,11 @@ ruby-gnome2 (1.0.0-1) unstable; urgency=low
     - libpanel-applet2-ruby
     - libpanel-applet2-ruby1.8
     - libpanel-applet2-ruby1.8-dbg
+  * The gtkmozembed binding packages were dropped because gtkmozembed itself
+    was dropped from xulrunner-dev. The packages are:
+    - libgtk-mozembed-ruby
+    - libgtk-mozembed-ruby1.8
+    - libgtk-mozembed-ruby1.8-dbg
   * The following Build dependencies were dropped because they were only
     needed to build some of to the above mentioned dropped packages (thanks to
     Michal Suchanek for spotting some of them):
diff --git a/debian/control b/debian/control
index c5276da..ae65177 100644
--- a/debian/control
+++ b/debian/control
@@ -436,55 +436,6 @@ Description: Transitional package for ruby-rsvg2-dbg
  This is a transitional package to ease upgrades to the ruby-rsvg2-dbg
  package. It can safely be removed.
 
-Package: ruby-gtkmozembed
-Architecture: any
-Depends: ${shlibs:Depends}, ruby-gtk2, ${misc:Depends}
-Replaces: libgtk-mozembed-ruby (<< 0.90.9-1~), libgtk-mozembed-ruby1.8 (<< 0.90.9-1~)
-Breaks: libgtk-mozembed-ruby (<< 0.90.9-1~), libgtk-mozembed-ruby1.8 (<< 0.90.9-1~)
-Provides: libgtk-mozembed-ruby, libgtk-mozembed-ruby1.8
-Description: ruby binding of GtkMozEmbed, gecko renderer
- GtkMozEmbed is a Ruby binding of GtkMozEmbed, a widget embedding a
- Mozilla Gecko renderer.
-
-Package: ruby-gtkmozembed-dbg
-Priority: extra
-Architecture: any
-Section: debug
-Depends: ruby-gtkmozembed (= ${binary:Version}), ${misc:Depends}
-Replaces: libgtk-mozembed-ruby1.8-dbg (<< 0.90.9-1~)
-Breaks: libgtk-mozembed-ruby1.8-dbg (<< 0.90.9-1~)
-Provides: libgtk-mozembed-ruby1.8-dbg
-Description: ruby binding of GtkMozEmbed, gecko renderer (debugging symbols)
- GtkMozEmbed is a Ruby binding of GtkMozEmbed, a widget embedding a
- Mozilla Gecko renderer.
- .
- This package contains the debugging symbols.
-
-Package: libgtk-mozembed-ruby
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends}, ruby-gtkmozembed
-Description: Transitional package for ruby-gtkmozembed
- This is a transitional package to ease upgrades to the ruby-gtkmozembed
- package. It can safely be removed.
-
-Package: libgtk-mozembed-ruby1.8
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends}, ruby-gtkmozembed
-Description: Transitional package for ruby-gtkmozembed
- This is a transitional package to ease upgrades to the ruby-gtkmozembed
- package. It can safely be removed.
-
-Package: libgtk-mozembed-ruby1.8-dbg
-Priority: extra
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends}, ruby-gtkmozembed-dbg
-Description: Transitional package for ruby-gtkmozembed-dbg
- This is a transitional package to ease upgrades to the ruby-gtkmozembed-dbg
- package. It can safely be removed.
-
 Package: ruby-vte
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -618,7 +569,7 @@ Description: Transitional package for ruby-gstreamer-dbg
 
 Package: ruby-gnome2
 Architecture: all
-Depends: ruby-rsvg2, ruby-gtkmozembed, ruby-vte, ruby-atk, ruby-gdk-pixbuf2, ruby-pango, ruby-gio2, ruby-goocanvas, ruby-poppler, ruby-gtksourceview2, ruby-gstreamer, ${misc:Depends}
+Depends: ruby-rsvg2, ruby-vte, ruby-atk, ruby-gdk-pixbuf2, ruby-pango, ruby-gio2, ruby-goocanvas, ruby-poppler, ruby-gtksourceview2, ruby-gstreamer, ${misc:Depends}
 Conflicts: libgnomeprint2-ruby (<< 0.19.1-1), libgnomeprint2-ruby1.8(<< 0.19.1-1), libgnomeprintui2-ruby (<< 0.19.1-1), libgnomeprintui2-ruby1.8 (<< 0.19.1-1), libgtksourceview1-ruby (<< 0.19.1-1), libgtksourceview1-ruby1.8 (<< 0.19.1-1)
 Breaks: libart2-ruby (<< 0.90.9-1), libart2-ruby1.8 (<< 0.90.9-1), libart2-ruby1.8-dbg (<< 0.90.9-1), libgnomecanvas2-ruby (<< 0.90.9-1), libgnomecanvas2-ruby1.8 (<< 0.90.9-1), libgnomecanvas2-ruby1.8-dbg (<< 0.90.9-1), libgnome2-ruby (<< 0.90.9-1), libgnome2-ruby1.8 (<< 0.90.9-1), libgnome2-ruby1.8-dbg (<< 0.90.9-1), libgconf2-ruby (<< 0.90.9-1), libgconf2-ruby1.8 (<< 0.90.9-1), libgconf2-ruby1.8-dbg (<< 0.90.9-1), libglade2-ruby (<< 0.90.9-1), libglade2-ruby1.8 (<< 0.90.9-1), libglade2-ruby1.8-dbg (<< 0.90.9-1), libgtkglext1-ruby (<< 0.90.9-1), libgtkglext1-ruby1.8 (<< 0.90.9-1), libgtkglext1-ruby1.8-dbg (<< 0.90.9-1), libgnomevfs2-ruby (<< 0.90.9-1), libgnomevfs2-ruby1.8 (<< 0.90.9-1), libgnomevfs2-ruby1.8-dbg (<< 0.90.9-1), libpanel-applet2-ruby (<< 0.90.9-1), libpanel-applet2-ruby1.8 (<< 0.90.9-1), libpanel-applet2-ruby1.8-dbg (<< 0.90.9-1)
 Description: GNOME-related bindings for the Ruby language
diff --git a/extconf.rb b/extconf.rb
index 5f7146d..ed7fd26 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -42,6 +42,9 @@ if subdirs.size == 0
     subdir[0..$topsrcdir.size] = ""
     File.dirname(subdir)
   end
+  subdirs.reject! do |subdir|
+    subdir =~ /gtkmozembed/
+  end
   priorlibs &= subdirs
   subdirs -= priorlibs
   subdirs = priorlibs + subdirs #Change the order

-- 
ruby-gnome2.git