r17376 - in /desktop/experimental/gtk+2.0/debian: changelog control control.in

kov at users.alioth.debian.org kov at users.alioth.debian.org
Wed Nov 5 12:48:15 UTC 2008 

Author: kov
Date: Wed Nov  5 12:48:15 2008
New Revision: 17376

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17376
Log:
replace/conflict with gail

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/control
    desktop/experimental/gtk+2.0/debian/control.in

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=17376&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Nov  5 12:48:15 2008
@@ -20,6 +20,8 @@
   * 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:

Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=17376&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control (original)
+++ desktop/experimental/gtk+2.0/debian/control Wed Nov  5 12:48:15 2008
@@ -52,6 +52,7 @@
            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 @@
            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 @@
             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 @@
 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 @@
 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

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=17376&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in (original)
+++ desktop/experimental/gtk+2.0/debian/control.in Wed Nov  5 12:48:15 2008
@@ -52,6 +52,7 @@
            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 @@
            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 @@
             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 @@
 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 @@
 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

More information about the pkg-gnome-commits mailing list