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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 702b1fd3f8167cba4ed19f9122c0c94ff0a2e32e
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Fri Jul 1 17:33:34 2011 -0700

    Trying Breaks: instead of Conflicts

diff --git a/debian/control b/debian/control
index 5d9962c..e5cf649 100644
--- a/debian/control
+++ b/debian/control
@@ -619,7 +619,8 @@ 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}
-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 (<< 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)
+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
  These bindings allow use of the GNOME developer platform using the Ruby
  programming language.
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 9d9734f..cec55da 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -42,29 +42,3 @@ ruby-gnome2 binary: conflicts-with-version libgnomeprintui2-ruby (<< 0.19.1-1)
 ruby-gnome2 binary: conflicts-with-version libgnomeprintui2-ruby1.8 (<< 0.19.1-1)
 ruby-gnome2 binary: conflicts-with-version libgtksourceview1-ruby (<< 0.19.1-1)
 ruby-gnome2 binary: conflicts-with-version libgtksourceview1-ruby1.8 (<< 0.19.1-1)
-# conflicts with version issues: if they are not used, apt-get cannot upgrade
-# correcly (although aptitude can): it will remove ruby-gnome2
-ruby-gnome2 binary: conflicts-with-version libart2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libart2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libart2-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgconf2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgconf2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgconf2-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libglade2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libglade2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libglade2-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnome2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnome2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnome2-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnomecanvas2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnomecanvas2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnomecanvas2-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnomevfs2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnomevfs2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgnomevfs2-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgtkglext1-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgtkglext1-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libgtkglext1-ruby1.8-dbg (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libpanel-applet2-ruby (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libpanel-applet2-ruby1.8 (<< 0.90.9-1)
-ruby-gnome2 binary: conflicts-with-version libpanel-applet2-ruby1.8-dbg (<< 0.90.9-1)

-- 
ruby-gnome2.git