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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 8b5205fde78afb91cdc7a09ec326cc3cf5f903c6
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Jun 25 20:04:46 2011 -0700

    Always check debian package against upstream

diff --git a/debian/check-upstream-versus-debian b/debian/check-upstream-versus-debian
index 6fd8899..ed81806 100755
--- a/debian/check-upstream-versus-debian
+++ b/debian/check-upstream-versus-debian
@@ -2,24 +2,54 @@
 
 set -e
 
+get_deps() {
+  pkg="$1"
+  sed "1,/^Package: $pkg$/ d" debian/control  | sed '/^$/,$ d; /^Depends: /!d; s/Depends: //; s/\s*,\s*/\n/g' | sed '/^\$/d; s/\s.*//'
+}
+
+ruby_gnome2_deps=$(get_deps ruby-gnome2)
+while true; do
+
+  old_deps="$ruby_gnome2_deps"
+  new_deps=$(for dep in $ruby_gnome2_deps; do get_deps $dep; done | sort | uniq)
+  ruby_gnome2_deps=$(for dep in $ruby_gnome2_deps $new_deps; do echo $dep; done | sort | uniq)
+
+  if test "$ruby_gnome2_deps" = "$old_deps" ; then
+    break
+  fi
+
+done
+
+failed=false
+fail() {
+  echo "E: $@"
+  failed=true
+}
+
 for upstream_pkg in $(ls -1 */extconf.rb | xargs -n 1 dirname); do
 
   pkg=ruby-${upstream_pkg/_/-}
 
   if ! grep -q "^Package: $pkg$" debian/control; then
-    echo "W: $pkg not found in debian/control!"
+    fail "$pkg not found in debian/control!"
   fi
   if ! test -e debian/$pkg.install; then
-    echo "W: debian/$pkg.install not found!"
+    fail "debian/$pkg.install not found!"
   fi
   if test -e $upstream_pkg/sample && ! test -e debian/$pkg.examples; then
-    echo "W: debian/$pkg.examples not found, but $upstream_pkg/sample exists!"
+    fail "debian/$pkg.examples not found, but $upstream_pkg/sample exists!"
+  fi
+
+  if ! (echo "$ruby_gnome2_deps" | grep -q $pkg); then
+    fail "ruby-gnome2 does NOT depend on $pkg!"
   fi
 
 done
 
 for pkg in $(ls -1 debian/*.{install,examples} | sed 's/debian\/\(.*\)\..*/\1/g' | sort | uniq); do
   if ! grep -q "^Package: $pkg$" debian/control; then
-    echo "W: debian/$pkg.{examples,install} found, but package $pkg is not in debian/control"
+    fail "debian/$pkg.{examples,install} found, but package $pkg is not in debian/control"
   fi
 done
+
+test "$failed" = 'false'
diff --git a/debian/control b/debian/control
index 73f3cf5..859ceeb 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-gtk-mozembed, ruby-vte, ruby-atk, ruby-gdk-pixbuf2, ruby-gnomecanvas2, ruby-pango, ruby-gio2, ${misc:Depends}
+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}
 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
diff --git a/debian/rules b/debian/rules
index 3d2f47d..19edc3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,10 @@
 %:
 	dh --with xulrunner $@
 
+override_dh_auto_configure:
+	debian/check-upstream-versus-debian
+	dh_auto_configure
+
 override_dh_auto_install:
 	debian/build ruby1.8
 	debian/build ruby1.9.1

-- 
ruby-gnome2.git