rev 9110 - branches/kde4/packages/kdebase-runtime/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-01-23 22:32:08 +0000 (Wed, 23 Jan 2008)
New Revision: 9110

Modified:
   branches/kde4/packages/kdebase-runtime/debian/changelog
   branches/kde4/packages/kdebase-runtime/debian/control
Log:
Move Conflict on kdebluetooth from the source fields to the
kdebase-runtime package fields.



Modified: branches/kde4/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-23 22:10:21 UTC (rev 9109)
+++ branches/kde4/packages/kdebase-runtime/debian/changelog	2008-01-23 22:32:08 UTC (rev 9110)
@@ -4,6 +4,8 @@
   
   * Do not ship khelpcenter for now, KDE 4 does not contain any help anyway,
     and it is updating KDE 3's khelpcenter. (Closes: #462227)
+  * Move Conflict on kdebluetooth from the source fields to the
+    kdebase-runtime package fields.
 
   +++ Changes by Matthew Rosewarne:
 

Modified: branches/kde4/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4/packages/kdebase-runtime/debian/control	2008-01-23 22:10:21 UTC (rev 9109)
+++ branches/kde4/packages/kdebase-runtime/debian/control	2008-01-23 22:32:08 UTC (rev 9110)
@@ -6,7 +6,6 @@
 Build-Depends: cdbs, debhelper (>= 6), quilt, cmake, kdepimlibs5-dev (>= 4:4.0.0-1),
  libclucene-dev, libphonon-dev, libsmbclient-dev, libsoprano-dev (>= 2.0.0),
  libstrigiqtdbusclient-dev (>= 0.5.7), libxcb1-dev, libxine-dev
-Conflicts: kdebluetooth (<< 1.0~beta7-1)
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdebase-runtime
@@ -16,6 +15,7 @@
 Section: kde
 Architecture: any
 Replaces: kdebase-bin (<< 4:4.0.0-1)
+Conflicts: kdebluetooth (<< 1.0~beta7-1)
 Depends: ${shlibs:Depends}, kdebase-runtime-bin-kde4 (= ${binary:Version}),
  kdebase-runtime-data (>= ${source:Version}),
  kde-icons-oxygen (>= ${source:Version})