r17655 - in /desktop/experimental/libgnomekbd/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov 21 17:33:30 2008
New Revision: 17655

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17655
Log:
libgnomekbd-dev conflicts/replaces/provides libgnomekbdui-dev.

Modified:
    desktop/experimental/libgnomekbd/debian/changelog
    desktop/experimental/libgnomekbd/debian/control
    desktop/experimental/libgnomekbd/debian/control.in

Modified: desktop/experimental/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/changelog?rev=17655&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/changelog (original)
+++ desktop/experimental/libgnomekbd/debian/changelog Fri Nov 21 17:33:30 2008
@@ -11,6 +11,7 @@
   * Introduce quilt for patch management; build-depend on quilt.
   * 01_requires_private.patch: new patch. Move dependencies to 
     Requires.private.
+  * libgnomekbd-dev conflicts/replaces/provides libgnomekbdui-dev.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 21 Nov 2008 17:45:55 +0100
 

Modified: desktop/experimental/libgnomekbd/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control?rev=17655&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control (original)
+++ desktop/experimental/libgnomekbd/debian/control Fri Nov 21 17:33:30 2008
@@ -22,6 +22,9 @@
 Package: libgnomekbd-dev
 Section: libdevel
 Architecture: any
+Conflicts: libgnomekbdui-dev
+Replaces: libgnomekbdui-dev
+Provides: libgnomekbdui-dev
 Depends: libgnomekbd3 (= ${binary:Version}),
         libglib2.0-dev (>= 2.16),
         libgtk2.0-dev (>= 2.13),

Modified: desktop/experimental/libgnomekbd/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomekbd/debian/control.in?rev=17655&op=diff
==============================================================================
--- desktop/experimental/libgnomekbd/debian/control.in (original)
+++ desktop/experimental/libgnomekbd/debian/control.in Fri Nov 21 17:33:30 2008
@@ -22,6 +22,9 @@
 Package: libgnomekbd-dev
 Section: libdevel
 Architecture: any
+Conflicts: libgnomekbdui-dev
+Replaces: libgnomekbdui-dev
+Provides: libgnomekbdui-dev
 Depends: libgnomekbd3 (= ${binary:Version}),
         libglib2.0-dev (>= 2.16),
         libgtk2.0-dev (>= 2.13),