* Remove versioned conflicts with libgail packages.

* Remove libgail18.shlibs.
This commit is contained in:
Josselin Mouette
2008-11-11 17:18:06 +00:00
parent 44c83cfdcd
commit 1f984d2d5c
5 changed files with 9 additions and 16 deletions

2
debian/changelog vendored
View File

@ -14,6 +14,8 @@ gtk+2.0 (2.14.4-3) experimental; urgency=low
* Dont 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@debian.org> Tue, 11 Nov 2008 14:44:21 +0100

10
debian/control vendored
View File

@ -52,7 +52,6 @@ Conflicts: libgtk2.0-0png3,
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 @@ Recommends: python (>= 2.4),
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 @@ Architecture: any
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 @@ Architecture: all
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

10
debian/control.in vendored
View File

@ -52,7 +52,6 @@ Conflicts: libgtk2.0-0png3,
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 @@ Recommends: python (>= 2.4),
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 @@ Architecture: any
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 @@ Architecture: all
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

View File

@ -1 +0,0 @@
libgailutil 18 libgail18 (>= 1.10.1), libgail-common (>= 1.10.1)

2
debian/rules vendored
View File

@ -334,7 +334,7 @@ binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PK
--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