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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 3bf953794bc4c46f9d31bcb95a60118ebee43c24
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun Jun 26 20:45:59 2011 -0700

    Don't let ruby-gnome2 depend on dropped packages

diff --git a/debian/check-upstream-versus-debian b/debian/check-upstream-versus-debian
index ed81806..ae5cef4 100755
--- a/debian/check-upstream-versus-debian
+++ b/debian/check-upstream-versus-debian
@@ -52,4 +52,10 @@ for pkg in $(ls -1 debian/*.{install,examples} | sed 's/debian\/\(.*\)\..*/\1/g'
   fi
 done
 
+for pkg in $ruby_gnome2_deps; do
+  if test "$pkg" != 'ruby' && test "$pkg" != 'ruby-cairo' && ! grep -q "^Package: $pkg$" debian/control; then
+    fail "ruby-gnome2 depends on $pkg, but it does not on debian/control!"
+  fi
+done
+
 test "$failed" = 'false'
diff --git a/debian/control b/debian/control
index 859ceeb..44f56f7 100644
--- a/debian/control
+++ b/debian/control
@@ -618,7 +618,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-gnomecanvas2, ruby-pango, ruby-gio2, ruby-goocanvas, ruby-poppler, ruby-gtksourceview2, ruby-gstreamer ${misc:Depends}
+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}
 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), libart2-ruby, libart2-ruby1.8, libart2-ruby1.8-dbg, libgnomecanvas2-ruby, libgnomecanvas2-ruby1.8, libgnomecanvas2-ruby1.8-dbg, libgnome2-ruby, libgnome2-ruby1.8, libgnome2-ruby1.8-dbg, libgconf2-ruby, libgconf2-ruby1.8, libgconf2-ruby1.8-dbg, libglade2-ruby, libglade2-ruby1.8, libglade2-ruby1.8-dbg, libgtkglext1-ruby, libgtkglext1-ruby1.8, libgtkglext1-ruby1.8-dbg, libgnomevfs2-ruby, libgnomevfs2-ruby1.8, libgnomevfs2-ruby1.8-dbg, libpanel-applet2-ruby, libpanel-applet2-ruby1.8, libpanel-applet2-ruby1.8-dbg
 Description: GNOME-related bindings for the Ruby language
  These bindings allow use of the GNOME developer platform using the Ruby

-- 
ruby-gnome2.git