replace/conflict with gail

This commit is contained in:
Gustavo Noronha
2008-11-05 12:48:15 +00:00
parent c34c8604f1
commit fa960afb7c
3 changed files with 32 additions and 14 deletions

2
debian/changelog vendored
View File

@ -20,6 +20,8 @@ gtk+2.0 (2.14.4-1) UNRELEASED; urgency=low
* debian/control.in:
- added libjasper-dev to the Build-Depends, as GTK+ now supports
JPEG2000
- make GTK+ packages conflict/replace with gail ones, since they are now
included in GTK+
* debian/patches/092_fix_printtest_include.patch:
- new patch, to fix build problem in print test
* debian/patches/071_jasper_link_fix.patch:

22
debian/control vendored
View File

@ -52,6 +52,7 @@ Conflicts: libgtk2.0-0png3,
gimp1.3 (<< 1.3.7-1.1),
metatheme (<< 0.9.7-3),
libgnomeui-0 (<= 2.14.1-3),
libgail18,
gtk2.0-examples (<< 2.2.0),
libgdkxft0,
openoffice.org-core (<< 2.2.1-8),
@ -96,7 +97,8 @@ Conflicts: libgtk2.0-0png3,
libeel2-2.18,
xfwm4 (<< 4.4.1-3),
metacity (<< 1:2.20.0-1)
Replaces: libgtk2.0-0png3
Replaces: libgtk2.0-0png3,
libgail18
Recommends: hicolor-icon-theme,
libgtk2.0-bin
Suggests: librsvg2-common
@ -206,8 +208,10 @@ Recommends: python (>= 2.4),
debhelper
Suggests: libgtk2.0-doc
Replaces: libgtk1.3-dev,
gtk2-engines-pixbuf (<< 2.8.18-5)
Conflicts: libgtk1.3-dev
gtk2-engines-pixbuf (<< 2.8.18-5),
libgail-dev
Conflicts: libgtk1.3-dev,
libgail-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
@ -243,8 +247,10 @@ Architecture: any
Depends: libgtk2.0-0 (= ${binary:Version}),
libgtk2.0-common,
${misc:Depends}
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
Conflicts: libgtk2.0-dbg,
libgail-dbg
Replaces: libgtk2.0-dbg,
libgail-dbg
Description: The GTK+ libraries and debugging symbols
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
@ -260,8 +266,10 @@ Section: doc
Architecture: all
Depends: lynx | www-browser,
${misc:Depends}
Replaces: libgtk1.3-doc
Conflicts: libgtk1.3-doc
Replaces: libgtk1.3-doc,
libgail-common
Conflicts: libgtk1.3-doc,
libgail-common
Recommends: libglib2.0-doc,
libatk1.0-doc,
libpango1.0-doc

22
debian/control.in vendored
View File

@ -52,6 +52,7 @@ Conflicts: libgtk2.0-0png3,
gimp1.3 (<< 1.3.7-1.1),
metatheme (<< 0.9.7-3),
libgnomeui-0 (<= 2.14.1-3),
libgail18,
gtk2.0-examples (<< 2.2.0),
libgdkxft0,
openoffice.org-core (<< 2.2.1-8),
@ -96,7 +97,8 @@ Conflicts: libgtk2.0-0png3,
libeel2-2.18,
xfwm4 (<< 4.4.1-3),
metacity (<< 1:2.20.0-1)
Replaces: libgtk2.0-0png3
Replaces: libgtk2.0-0png3,
libgail18
Recommends: hicolor-icon-theme,
@BIN_PKG@
Suggests: librsvg2-common
@ -206,8 +208,10 @@ Recommends: python (>= 2.4),
debhelper
Suggests: @DOC_PKG@
Replaces: libgtk1.3-dev,
gtk2-engines-pixbuf (<< 2.8.18-5)
Conflicts: libgtk1.3-dev
gtk2-engines-pixbuf (<< 2.8.18-5),
libgail-dev
Conflicts: libgtk1.3-dev,
libgail-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
@ -243,8 +247,10 @@ Architecture: any
Depends: @SHARED_PKG@ (= ${binary:Version}),
@COMMON_PKG@,
${misc:Depends}
Conflicts: libgtk2.0-dbg
Replaces: libgtk2.0-dbg
Conflicts: libgtk2.0-dbg,
libgail-dbg
Replaces: libgtk2.0-dbg,
libgail-dbg
Description: The GTK+ libraries and debugging symbols
The GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, the GTK+ is suitable
@ -260,8 +266,10 @@ Section: doc
Architecture: all
Depends: lynx | www-browser,
${misc:Depends}
Replaces: libgtk1.3-doc
Conflicts: libgtk1.3-doc
Replaces: libgtk1.3-doc,
libgail-common
Conflicts: libgtk1.3-doc,
libgail-common
Recommends: libglib2.0-doc,
libatk1.0-doc,
libpango1.0-doc