rev 9900 - trunk/packages/kdelibs/debian

[Modestas Vainius]

Author: modax-guest
Date: 2008-03-29 08:51:29 +0000 (Sat, 29 Mar 2008)
New Revision: 9900

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/control.in
Log:
Revert previous commit. It's pointless change in this package

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2008-03-28 22:18:52 UTC (rev 9899)
+++ trunk/packages/kdelibs/debian/changelog	2008-03-29 08:51:29 UTC (rev 9900)
@@ -1,9 +1,3 @@
-kdelibs (4:3.5.9.dfsg.1-3~pre1) unstable; urgency=low
-
-  * Conflict with automake-dirty libarts1c2a (<< 1.5.9-1).
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 15 Mar 2008 14:51:19 +0200
-
 kdelibs (4:3.5.9.dfsg.1-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2008-03-28 22:18:52 UTC (rev 9899)
+++ trunk/packages/kdelibs/debian/control	2008-03-29 08:51:29 UTC (rev 9900)
@@ -57,7 +57,7 @@
 Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}),
  kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, x11-xserver-utils, xauth
 Suggests: fam, perl-suid
-Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6), kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1), libarts1c2a (<< 1.5.9-1)
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6), kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1)
 Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
  kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1),
  kdelibs4-dev (= 4:3.5.7.dfsg.1-5)

Modified: trunk/packages/kdelibs/debian/control.in
===================================================================
--- trunk/packages/kdelibs/debian/control.in	2008-03-28 22:18:52 UTC (rev 9899)
+++ trunk/packages/kdelibs/debian/control.in	2008-03-29 08:51:29 UTC (rev 9900)
@@ -57,7 +57,7 @@
 Depends: ${shlibs:Depends}, kdelibs-data (>> ${KDE-Version3}),
  kdelibs-data (<< ${KDE-Next-Version3}), menu-xdg, perl, x11-xserver-utils, xauth
 Suggests: fam, perl-suid
-Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6), kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1), libarts1c2a (<< 1.5.9-1)
+Conflicts: kdelibs4, kdelibs4c2, kdelibs-bin (<< 4:3.3.3), kdelibs4-dev (<< 4:3.5.7.dfsg.1-6), kdebase-kio-plugins (<= 4:3.5.9.dfsg.1-1)
 Replaces: kdelibs4, kdelibs4c2, kdeartwork-style (<< 4:3.4.0),
  kcontrol (<< 4:3.4.0), kdelibs-bin (<< 4:3.5.3-1),
  kdelibs4-dev (= 4:3.5.7.dfsg.1-5)