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

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 54d8e20b535fcaa563ca7b36010387f6467b83c4
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Fri Jul 1 16:55:53 2011 -0700

    Fix lintian overrides

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index b263678..9d9734f 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -35,38 +35,36 @@ 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)
-
+ruby-gnome2 binary: conflicts-with-version libgnomeprint2-ruby (<< 0.19.1-1)
+ruby-gnome2 binary: conflicts-with-version libgnomeprint2-ruby1.8 (<< 0.19.1-1)
+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: 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 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