r21841 - in /packages/experimental/libxklavier/debian: changelog control control.in

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Oct  8 10:14:34 2009
New Revision: 21841

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21841
Log:
Add conflicts/replaces on libxklavier-dev for libxklavier12-dev.

Modified:
    packages/experimental/libxklavier/debian/changelog
    packages/experimental/libxklavier/debian/control
    packages/experimental/libxklavier/debian/control.in

Modified: packages/experimental/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libxklavier/debian/changelog?rev=21841&op=diff
==============================================================================
--- packages/experimental/libxklavier/debian/changelog [utf-8] (original)
+++ packages/experimental/libxklavier/debian/changelog [utf-8] Thu Oct  8 10:14:34 2009
@@ -19,6 +19,7 @@
       + Rename libxklavier12-dev to libxklavier-dev, no need to put the
         SONAME in the dev package since most packages usually still build
         after a new xklavier SONAME and we only ship one version at a time.
+      + Add conflicts/replaces on libxklavier-dev for libxklavier12-dev.
   * debian/control.in:
     - Standards-Version is 3.8.3, no changes needed.
     - Remove old conflicts/replaces.

Modified: packages/experimental/libxklavier/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libxklavier/debian/control?rev=21841&op=diff
==============================================================================
--- packages/experimental/libxklavier/debian/control [utf-8] (original)
+++ packages/experimental/libxklavier/debian/control [utf-8] Thu Oct  8 10:14:34 2009
@@ -40,7 +40,7 @@
          libglib2.0-dev (>= 2.6.0),
          libxml2-dev (>= 2.0.0),
          libx11-dev
-Replaces: libxklavier11-dev
-Conflicts: libxklavier11-dev
+Replaces: libxklavier11-dev, libxklavier12-dev
+Conflicts: libxklavier11-dev, libxklavier12-dev
 Description: Development files for libxklavier
  These are headers and other files needed to develop with libxklavier.

Modified: packages/experimental/libxklavier/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libxklavier/debian/control.in?rev=21841&op=diff
==============================================================================
--- packages/experimental/libxklavier/debian/control.in [utf-8] (original)
+++ packages/experimental/libxklavier/debian/control.in [utf-8] Thu Oct  8 10:14:34 2009
@@ -40,7 +40,9 @@
          libglib2.0-dev (>= 2.6.0),
          libxml2-dev (>= 2.0.0),
          libx11-dev
-Replaces: libxklavier11-dev
-Conflicts: libxklavier11-dev
+Replaces: libxklavier11-dev,
+          libxklavier12-dev
+Conflicts: libxklavier11-dev,
+           libxklavier12-dev
 Description: Development files for libxklavier
  These are headers and other files needed to develop with libxklavier.