r17474 - in /desktop/experimental/gtk+2.0/debian: changelog control control.in libgail18.shlibs rules

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Nov 11 17:18:06 2008
New Revision: 17474

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17474
Log:
* Remove versioned conflicts with libgail packages.
* Remove libgail18.shlibs.

Removed:
    desktop/experimental/gtk+2.0/debian/libgail18.shlibs
Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/control
    desktop/experimental/gtk+2.0/debian/control.in
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=17474&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Nov 11 17:18:06 2008
@@ -14,6 +14,8 @@
   * Don’t install libgail in the udeb.
   * Stop shipping /usr/lib/pkgconfig/libgtk-directfb-2.0-0/, nobody uses 
     it.
+  * Remove versioned conflicts with libgail packages.
+  * Remove libgail18.shlibs.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 11 Nov 2008 14:44:21 +0100
 

Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=17474&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Tue Nov 11 17:18:06 2008
@@ -52,7 +52,6 @@
            gimp1.3 (<< 1.3.7-1.1),
            metatheme (<< 0.9.7-3),
            libgnomeui-0 (<= 2.14.1-3),
-           libgail18 (<< 2.14.4),
            gtk2.0-examples (<< 2.2.0),
            libgdkxft0,
            openoffice.org-core (<< 2.2.1-8),
@@ -208,8 +207,7 @@
 Suggests: libgtk2.0-doc
 Replaces: libgtk1.3-dev,
           gtk2-engines-pixbuf (<< 2.8.18-5)
-Conflicts: libgtk1.3-dev,
-           libgail-dev (<< 2.14.4)
+Conflicts: libgtk1.3-dev
 Description: Development files for the GTK+ library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -245,8 +243,7 @@
 Depends: libgtk2.0-0 (= ${binary:Version}),
          libgtk2.0-common,
          ${misc:Depends}
-Conflicts: libgtk2.0-dbg,
-           libgail-dbg (<< 2.14.4)
+Conflicts: libgtk2.0-dbg
 Replaces: libgtk2.0-dbg
 Description: The GTK+ libraries and debugging symbols
  The GTK+ is a multi-platform toolkit for creating graphical user
@@ -264,8 +261,7 @@
 Depends: lynx | www-browser,
          ${misc:Depends}
 Replaces: libgtk1.3-doc
-Conflicts: libgtk1.3-doc,
-           libgail-common (<< 2.14.4)
+Conflicts: libgtk1.3-doc
 Recommends: libglib2.0-doc,
             libatk1.0-doc,
             libpango1.0-doc

Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=17474&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Tue Nov 11 17:18:06 2008
@@ -52,7 +52,6 @@
            gimp1.3 (<< 1.3.7-1.1),
            metatheme (<< 0.9.7-3),
            libgnomeui-0 (<= 2.14.1-3),
-           libgail18 (<< 2.14.4),
            gtk2.0-examples (<< 2.2.0),
            libgdkxft0,
            openoffice.org-core (<< 2.2.1-8),
@@ -208,8 +207,7 @@
 Suggests: @DOC_PKG@
 Replaces: libgtk1.3-dev,
           gtk2-engines-pixbuf (<< 2.8.18-5)
-Conflicts: libgtk1.3-dev,
-           libgail-dev (<< 2.14.4)
+Conflicts: libgtk1.3-dev
 Description: Development files for the GTK+ library
  The GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, the GTK+ is suitable
@@ -245,8 +243,7 @@
 Depends: @SHARED_PKG@ (= ${binary:Version}),
          @COMMON_PKG@,
          ${misc:Depends}
-Conflicts: libgtk2.0-dbg,
-           libgail-dbg (<< 2.14.4)
+Conflicts: libgtk2.0-dbg
 Replaces: libgtk2.0-dbg
 Description: The GTK+ libraries and debugging symbols
  The GTK+ is a multi-platform toolkit for creating graphical user
@@ -264,8 +261,7 @@
 Depends: lynx | www-browser,
          ${misc:Depends}
 Replaces: libgtk1.3-doc
-Conflicts: libgtk1.3-doc,
-           libgail-common (<< 2.14.4)
+Conflicts: libgtk1.3-doc
 Recommends: libglib2.0-doc,
             libatk1.0-doc,
             libpango1.0-doc

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=17474&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Tue Nov 11 17:18:06 2008
@@ -334,7 +334,7 @@
 		--add-udeb=$(UDEB_PKG)
 	dh_makeshlibs -plibgail18 \
 		-X$(MODULES_BASE_PATH) \
-		-V"libgail18 (>= $(SHVER))"
+		-V"libgail18 (>= $(SHVER)), libgail-common (>= $(SHVER))"
 	dh_installdeb -s
 	# override shlibs for libraries from this source before computing
 	# dependencies of packages generated from this source; we already have