rev 14337 - trunk/packages/kdebase-workspace/debian

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-04-09 22:22:52 +0000 (Thu, 09 Apr 2009)
New Revision: 14337

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/control
   trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   trunk/packages/kdebase-workspace/debian/systemsettings.install
Log:
Move the .desktop files of kcm_fonts, kcm_style and kcm_colors
to the systemsettings package, so that these kcms can actually
work without kdebase-workspace-bin.


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-04-09 17:25:05 UTC (rev 14336)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-04-09 22:22:52 UTC (rev 14337)
@@ -1,3 +1,13 @@
+kdebase-workspace (4:4.2.2-3) UNRELEASED; urgency=low
+
+  +++ Changes by George Kiagiadakis:
+
+  * Move the .desktop files of kcm_fonts, kcm_style and kcm_colors
+    to the systemsettings package, so that these kcms can actually
+    work without kdebase-workspace-bin.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 10 Apr 2009 01:20:51 +0300
+
 kdebase-workspace (4:4.2.2-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/kdebase-workspace/debian/control
===================================================================
--- trunk/packages/kdebase-workspace/debian/control	2009-04-09 17:25:05 UTC (rev 14336)
+++ trunk/packages/kdebase-workspace/debian/control	2009-04-09 22:22:52 UTC (rev 14337)
@@ -312,7 +312,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kdebase-workspace-bin (<= 4:4.0.98-1), kdebase-workspace-data (<< 4:4.1.80)
+Replaces: kdebase-workspace-bin (<= 4:4.2.2-2), kdebase-workspace-data (<< 4:4.1.80)
 Description: KDE 4 System Settings
  System Settings is an improved user interface for configuring the desktop
  and other aspects of the system.

Modified: trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-04-09 17:25:05 UTC (rev 14336)
+++ trunk/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-04-09 22:22:52 UTC (rev 14337)
@@ -115,12 +115,10 @@
 usr/share/kde4/services/autostart.desktop
 usr/share/kde4/services/bell.desktop
 usr/share/kde4/services/clock.desktop
-usr/share/kde4/services/colors.desktop
 usr/share/kde4/services/desktopthemedetails.desktop
 usr/share/kde4/services/display.desktop
 usr/share/kde4/services/energy.desktop
 usr/share/kde4/services/fontinst.desktop
-usr/share/kde4/services/fonts.desktop
 usr/share/kde4/services/fontthumbnail.desktop
 usr/share/kde4/services/joystick.desktop
 usr/share/kde4/services/kaccess.desktop
@@ -162,7 +160,6 @@
 usr/share/kde4/services/solidbackends/solid_hal_power.desktop
 usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
 usr/share/kde4/services/standard_actions.desktop
-usr/share/kde4/services/style.desktop
 usr/share/kde4/services/xinerama.desktop
 usr/share/kde4/servicetypes/screensaver.desktop
 usr/share/kde4/servicetypes/solidbluetoothmanager.desktop

Modified: trunk/packages/kdebase-workspace/debian/systemsettings.install
===================================================================
--- trunk/packages/kdebase-workspace/debian/systemsettings.install	2009-04-09 17:25:05 UTC (rev 14336)
+++ trunk/packages/kdebase-workspace/debian/systemsettings.install	2009-04-09 22:22:52 UTC (rev 14337)
@@ -8,6 +8,8 @@
 usr/share/doc/kde4/HTML/en/systemsettings/index.cache.bz2
 usr/share/doc/kde4/HTML/en/systemsettings/index.docbook
 usr/share/kde4/apps/systemsettings/systemsettingsui.rc
+usr/share/kde4/services/colors.desktop
+usr/share/kde4/services/fonts.desktop
 usr/share/kde4/services/settings-about-me.desktop
 usr/share/kde4/services/settings-accessibility.desktop
 usr/share/kde4/services/settings-advanced-user-settings.desktop
@@ -28,4 +30,5 @@
 usr/share/kde4/services/settings-sharing.desktop
 usr/share/kde4/services/settings-system.desktop
 usr/share/kde4/services/settings-window-behaviour.desktop
+usr/share/kde4/services/style.desktop
 usr/share/kde4/servicetypes/systemsettingscategory.desktop