rev 9194 - in branches/kde4/packages: kdebase-workspace/debian kdelibs/debian

[Fathi Boudra]

Author: fabo
Date: 2008-01-29 21:24:57 +0000 (Tue, 29 Jan 2008)
New Revision: 9194

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/control
Log:
Clean up our duplicate effort with Matthew


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-29 21:10:40 UTC (rev 9193)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2008-01-29 21:24:57 UTC (rev 9194)
@@ -3,7 +3,7 @@
   +++ Changes by Matthew Rosewarne:
 
   * Remove Depends: dbus-x11 from kdebase-workspace-bin,
-    now provided by kdelibs-bin.
+    now provided by kdelibs5.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 26 Jan 2008 09:28:30 +0100
 

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-29 21:10:40 UTC (rev 9193)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-29 21:24:57 UTC (rev 9194)
@@ -18,7 +18,6 @@
   * Bump Soprano minimum version to 2.0.0.
   * Remove redundant Depends: shared-mime-info from kdelibs5-dev.
   * Add Suggests: kdelibs5-doc to kdelibs5-dev.
-  * Add Depends: dbus-x11 to kdelibs-bin.
 
   +++ Changes by Armin Berres:
 
@@ -29,7 +28,7 @@
 
   * Make kdelibs5-dev installable on GNU/kFreeBSD. Thanks to Aurelien Jarno.
     (Closes: #462338)
-  * Add dbus-x11 dependency. Thanks to Chris Desjardins.
+  * Add dbus-x11 dependency to kdelibs5. Thanks to Chris Desjardins.
   * Add Vcs-Browser and Vcs-Svn fields.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Jan 2008 14:05:04 +0100

Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control	2008-01-29 21:10:40 UTC (rev 9193)
+++ branches/kde4/packages/kdelibs/debian/control	2008-01-29 21:24:57 UTC (rev 9194)
@@ -66,7 +66,7 @@
 
 Package: kdelibs-bin
 Architecture: any
-Depends: ${shlibs:Depends}, dbus-x11
+Depends: ${shlibs:Depends}
 Conflicts: kjscmd
 Description: executables for all KDE 4 core applications
  This package contains common executables used by all KDE 4 applications.