rev 16418 - trunk/packages/kdebase-runtime/debian

[Modestas Vainius]

Author: modax
Date: 2009-12-10 10:15:38 +0000 (Thu, 10 Dec 2009)
New Revision: 16418

Modified:
   trunk/packages/kdebase-runtime/debian/changelog
   trunk/packages/kdebase-runtime/debian/control
Log:
+++ Changes by Modestas Vainius:
* Make kdebase-runtime conflict with kdebase-kio-plugins due to ktrash
(Closes: #560291).

Modified: trunk/packages/kdebase-runtime/debian/changelog
===================================================================
--- trunk/packages/kdebase-runtime/debian/changelog	2009-12-10 00:41:37 UTC (rev 16417)
+++ trunk/packages/kdebase-runtime/debian/changelog	2009-12-10 10:15:38 UTC (rev 16418)
@@ -1,3 +1,12 @@
+kdebase-runtime (4:4.3.4-2) UNRELEASED; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Make kdebase-runtime conflict with kdebase-kio-plugins due to ktrash
+    (Closes: #560291).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 10 Dec 2009 12:11:31 +0200
+
 kdebase-runtime (4:4.3.4-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/kdebase-runtime/debian/control
===================================================================
--- trunk/packages/kdebase-runtime/debian/control	2009-12-10 00:41:37 UTC (rev 16417)
+++ trunk/packages/kdebase-runtime/debian/control	2009-12-10 10:15:38 UTC (rev 16418)
@@ -23,7 +23,7 @@
 Replaces: kdebase-bin (<< 4:4.2.90), kdelibs5 (<< 4:4.1.80), kdelibs-bin (<< 4:4.1.80),
  kdebase-workspace-bin (<< 4:4.2.90), kdebase-bin-kde3, kdebase-runtime-bin-kde4, kcontrol
 Conflicts: kdebluetooth (<< 1.0~beta7-1), phonon-backend-xine (<< 4:4.2.80), kdebase-runtime-bin-kde4,
- kdebase-bin-kde3, kcontrol
+ kdebase-bin-kde3, kcontrol, kdebase-kio-plugins
 Depends: ${shlibs:Depends}, kdebase-runtime-data (>= ${source:Version}),
  oxygen-icon-theme (>= 4:4.2.90), phonon-backend-xine | phonon-backend
 Recommends: hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd