rev 7133 - trunk/packages/kdelibs/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-08-25 03:48:06 +0000 (Sat, 25 Aug 2007)
New Revision: 7133

Modified:
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/control.in
Log:
conflicts


Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2007-08-25 01:51:25 UTC (rev 7132)
+++ trunk/packages/kdelibs/debian/control	2007-08-25 03:48:06 UTC (rev 7133)
@@ -56,7 +56,7 @@
 Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}),
  kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, xbase-clients
 Suggests: fam, perl-suid
-Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3)
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
 Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
  kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1)
 Description: core libraries and binaries for all KDE applications
@@ -88,6 +88,7 @@
  libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4)
 Provides: kdelibs-dev
+Conflicts: kdelibs4c2a (<< 4:3.5.7.dfsg.1-6)
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed

Modified: trunk/packages/kdelibs/debian/control.in
===================================================================
--- trunk/packages/kdelibs/debian/control.in	2007-08-25 01:51:25 UTC (rev 7132)
+++ trunk/packages/kdelibs/debian/control.in	2007-08-25 03:48:06 UTC (rev 7133)
@@ -56,7 +56,7 @@
 Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}),
  kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, xbase-clients
 Suggests: fam, perl-suid
-Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3)
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6)
 Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
  kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1)
 Description: core libraries and binaries for all KDE applications
@@ -88,6 +88,7 @@
  libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev,
  libavahi-client-dev (>= 0.4), libavahi-qt3-dev (>= 0.4)
 Provides: kdelibs-dev
+Conflicts: kdelibs4c2a (<< 4:3.5.7.dfsg.1-6)
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries
  This package contains all the headers and other related files needed