rev 7457 - branches/kde4/packages/kdelibs/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2007-10-14 12:43:22 +0000 (Sun, 14 Oct 2007)
New Revision: 7457

Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
Log:
add a kjscmdconflict


Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2007-10-14 12:38:55 UTC (rev 7456)
+++ branches/kde4/packages/kdelibs/debian/changelog	2007-10-14 12:43:22 UTC (rev 7457)
@@ -12,6 +12,10 @@
   * Update patches.
   * Depend on up to date libsoprano.
 
+  +++ Changes by Sune Vuorela
+
+  * kjscmd also exists in kjscmd from kdebindings. Adding conflict.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 07 Oct 2007 20:09:26 +0200
 
 kde4libs (4:3.93.0-1) experimental; urgency=low

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2007-10-14 12:38:55 UTC (rev 7456)
+++ branches/kde4/packages/kdelibs/debian/control	2007-10-14 12:43:22 UTC (rev 7457)
@@ -68,6 +68,7 @@
 Package: kdelibs-bin
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: kjscmd
 Description: binaries for all the KDE 4 beta core applications
  This package contains all the common core binaries used by all KDE 4
  applications.