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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 7155fefb566e9ca190088d3ee249651af2496d3f
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Fri Jul 1 15:57:10 2011 -0700

    Reintroduced versioned Conflicts:
    
    They are needed for a clean upgrade with apt-get; if they are not
    included apt-get will remove ruby-gnome2. aptitude works ok, though.

diff --git a/debian/control b/debian/control
index 44f56f7..5d9962c 100644
--- a/debian/control
+++ b/debian/control
@@ -619,7 +619,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}
-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
+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)
 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 a3f65d7..b263678 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -35,3 +35,38 @@ ruby-gnome2 source: dbg-package-missing-depends libpango1-ruby1.8-dbg
 ruby-gnome2 source: dbg-package-missing-depends libatk1-ruby1.8-dbg
 ruby-gnome2 source: dbg-package-missing-depends libgoocanvas-ruby1.8-dbg
 ruby-gnome2 source: dbg-package-missing-depends librsvg2-ruby1.8-dbg
+
+# These were needed for a previous transition
+ruby-gnome2: conflicts-with-version libgnomeprint2-ruby (<< 0.19.1-1)
+ruby-gnome2: conflicts-with-version libgnomeprint2-ruby1.8 (<< 0.19.1-1)
+ruby-gnome2: conflicts-with-version libgnomeprintui2-ruby (<< 0.19.1-1)
+ruby-gnome2: conflicts-with-version libgnomeprintui2-ruby1.8 (<< 0.19.1-1)
+ruby-gnome2: conflicts-with-version libgtksourceview1-ruby (<< 0.19.1-1)
+ruby-gnome2: 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: conflicts-with-version libart2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libart2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libart2-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnomecanvas2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnomecanvas2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnomecanvas2-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnome2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnome2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnome2-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgconf2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgconf2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgconf2-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libglade2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libglade2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libglade2-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgtkglext1-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgtkglext1-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgtkglext1-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnomevfs2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnomevfs2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libgnomevfs2-ruby1.8-dbg (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libpanel-applet2-ruby (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libpanel-applet2-ruby1.8 (<< 0.90.9-1)
+ruby-gnome2: conflicts-with-version libpanel-applet2-ruby1.8-dbg (<< 0.90.9-1)

-- 
ruby-gnome2.git