rev 13692 - branches/kde4.2/packages/kdebase-workspace/debian

[Modestas Vainius]

Author: modax-guest
Date: 2009-02-01 01:34:57 +0000 (Sun, 01 Feb 2009)
New Revision: 13692

Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/control
   branches/kde4.2/packages/kdebase-workspace/debian/installgen
   branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4.2/packages/kdebase-workspace/debian/kdm.install
Log:
Move greeters from libs/kdm to kdebase-workspace-bin to make unlocking
work without kdm installed (Closes: #513734).

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-01 01:23:44 UTC (rev 13691)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-01 01:34:57 UTC (rev 13692)
@@ -3,6 +3,8 @@
   +++ Changes by Modestas Vainius:
 
   * Make plasma-scriptengines recommend plasma-scriptengine-superkaramba.
+  * Move greeters from libs/kdm to kdebase-workspace-bin to make unlocking
+    work without kdm installed (Closes: #513734).
 
   ++ Changes by Armin Berres:
 
@@ -11,7 +13,7 @@
   * Explicitly build-depend on libnm-util-dev >= 0.7, for building against
     network-manager 0.7 (Closes: #513674).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jan 2009 14:38:46 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Feb 2009 03:30:42 +0200
 
 kdebase-workspace (4:4.2.0-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control	2009-02-01 01:23:44 UTC (rev 13691)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control	2009-02-01 01:34:57 UTC (rev 13692)
@@ -46,7 +46,7 @@
 Suggests: x11-xkb-utils
 Replaces: kdebase-bin (<< 4:4.0.0-1), kcontrol, kmenuedit, ktip, libplasma2,
  kde-window-manager (<< 4:4.1.80), kdebase-workspace-data (<< 4:4.1.82),
- kdebase-workspace-libs4+5 (<< 4:4.1.82)
+ kdebase-workspace-libs4+5 (<< 4:4.1.82), kdm (<< 4:4.2.0-2)
 Conflicts: kcontrol, libplasma1, libplasma2
 Description: core binaries for the KDE 4 base workspace module
  This package contains miscellaneous programs needed for a basic KDE 4 desktop

Modified: branches/kde4.2/packages/kdebase-workspace/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/installgen	2009-02-01 01:23:44 UTC (rev 13691)
+++ branches/kde4.2/packages/kdebase-workspace/debian/installgen	2009-02-01 01:34:57 UTC (rev 13692)
@@ -20,6 +20,10 @@
 dst:kwin
 
 [kdm]
+# Used by other kcms.
+skip from:/kcontrol/kdm/ dst:monitor.png$
+# greeters from libs/kdm go to kdebase-workspace-bin
+skip from:/libs/kdm/
 from:/kdm/
 dst:kdm
 

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-02-01 01:23:44 UTC (rev 13691)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2009-02-01 01:34:57 UTC (rev 13692)
@@ -63,6 +63,9 @@
 usr/lib/kde4/kded_networkstatus.so
 usr/lib/kde4/kded_powerdevil.so
 usr/lib/kde4/kfontviewpart.so
+usr/lib/kde4/kgreet_classic.so
+usr/lib/kde4/kgreet_generic.so
+usr/lib/kde4/kgreet_winbind.so
 usr/lib/kde4/kio_fonts.so
 usr/lib/kde4/krunner_bookmarksrunner.so
 usr/lib/kde4/krunner_calculatorrunner.so

Modified: branches/kde4.2/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/kdm.install	2009-02-01 01:23:44 UTC (rev 13691)
+++ branches/kde4.2/packages/kdebase-workspace/debian/kdm.install	2009-02-01 01:34:57 UTC (rev 13692)
@@ -12,9 +12,6 @@
 usr/bin/kdm
 usr/bin/kdmctl
 usr/lib/kde4/kcm_kdm.so
-usr/lib/kde4/kgreet_classic.so
-usr/lib/kde4/kgreet_generic.so
-usr/lib/kde4/kgreet_winbind.so
 usr/lib/kde4/libexec/kdm_config
 usr/lib/kde4/libexec/kdm_greet
 usr/lib/kde4/libexec/krootimage