[DRE-commits] [ruby-gnome2] 03/08: drop ruby-goocanvas until goocanvas-2.0 is available

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-gnome2.

commit 28deb55824a962a983537000bb32587ba100df74
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Oct 2 16:36:58 2013 +0200

    drop ruby-goocanvas until goocanvas-2.0 is available
---
 debian/control                        |   26 ++------------------------
 debian/patches/reject_goocanvas.patch |   18 ++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index b7c548b..c02a7fe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Cornet <acornet at debian.org>, Paul van Tilburg <paulvt at debian.org>, Michael Schutte <m.schutte.jr at gmail.com>, Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), ruby, ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, libpng-dev, libxmu-dev, librsvg2-dev (>= 2.8.0), 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, libjpeg-dev, ruby-cairo, ruby-pkg-config
+Build-Depends: debhelper (>= 7.0.50~), ruby, ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, libpng-dev, libxmu-dev, librsvg2-dev (>= 2.8.0), libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.8.0), pkg-config, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtksourceview2.0-dev, libjpeg-dev, ruby-cairo, ruby-pkg-config
 Standards-Version: 3.9.3
 Homepage: http://ruby-gnome2.sourceforge.jp/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-gnome2.git
@@ -129,28 +129,6 @@ Description: GTK+ bindings for the Ruby language (debugging symbols)
  .
  This package contains the debugging symbols.
 
-Package: ruby-goocanvas
-Architecture: any
-Depends: ${shlibs:Depends}, ruby-gtk2 (= ${binary:Version}), ${misc:Depends}
-Description: GooCanvas bindings for the Ruby language
- GooCanvas is a canvas widget for GTK+ that uses the cairo 2D library.
- This package contains libraries for using the GtkSourceView2 text widget
- with syntax highlighting and other features typical of a source code
- editor in the Ruby programming language.
-
-Package: ruby-goocanvas-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ruby-goocanvas (= ${binary:Version}), ${misc:Depends}
-Description: GooCanvas bindings for the Ruby language (debugging symbols)
- GooCanvas is a canvas widget for GTK+ that uses the cairo 2D library.
- This package contains libraries for using the GtkSourceView2 text widget
- with syntax highlighting and other features typical of a source code
- editor in the Ruby programming language.
- .
- This package contains the debugging symbols.
-
 Package: ruby-gtksourceview2
 Architecture: any
 Depends: ${shlibs:Depends}, ruby-gtk2 (= ${binary:Version}), ${misc:Depends}
@@ -249,7 +227,7 @@ Description: GStreamer bindings for the Ruby language (debugging symbols)
 
 Package: ruby-gnome2
 Architecture: all
-Depends: ruby-rsvg2, 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-poppler, ruby-gtksourceview2, ruby-gstreamer, ${misc:Depends}
 Description: GNOME-related bindings for the Ruby language
  These bindings allow use of the GNOME developer platform using the Ruby
  programming language.
diff --git a/debian/patches/reject_goocanvas.patch b/debian/patches/reject_goocanvas.patch
new file mode 100644
index 0000000..9f91066
--- /dev/null
+++ b/debian/patches/reject_goocanvas.patch
@@ -0,0 +1,18 @@
+Description: do not build ruby-goocanvas until goocanvas-2.0 is available
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588177
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2013-10-02
+
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -52,6 +52,10 @@
+     subdir[0..$topsrcdir.size] = ""
+     File.dirname(subdir)
+   end
++
++  subdirs.reject! do |subdir|
++    subdir =~ /goocanvas/
++  end
+   priorlibs &= subdirs
+   subdirs -= priorlibs
+   subdirs = priorlibs + subdirs #Change the order
diff --git a/debian/patches/series b/debian/patches/series
index 875c401..79ef553 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Fail-the-build-if-any-subpackage-fails
+reject_goocanvas.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-gnome2.git