rev 8232 - branches/kde4/packages/kdebase-workspace/debian

[Modestas Vainius]

Author: modax-guest
Date: 2007-12-14 08:45:49 +0000 (Fri, 14 Dec 2007)
New Revision: 8232

Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/control
   branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
   branches/kde4/packages/kdebase-workspace/debian/kdm.install
   branches/kde4/packages/kdebase-workspace/debian/rules
Log:
kdm enhancements (PAM, locales, works without kdebase-workspace-bin). verified.

Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2007-12-14 00:58:24 UTC (rev 8231)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2007-12-14 08:45:49 UTC (rev 8232)
@@ -1,3 +1,18 @@
+kdebase-workspace (4:3.97.0-2) experimental; urgency=low
+
+  +++ Changes by Modestas Vainius:
+
+  * Fix a few issues with kdm. Among other things, this should make it
+    possible to use kdm4 with KDE3:
+    - debian/control: add libpam0g-dev to Build-depends to enable PAM
+      support for KDM. This adds support for locales!
+    - debian/rules: pass -DKDE4_KDM_PAM_SERVICE=kdm to make kdm use
+    /etc/pam.d/{kdm,kdm-np} instead of default /etc/pam.d/{kde,kde-np}
+    - debian/kdm.install: move greeters here from kdebase-workspace-bin
+    - debian/control: adjust kdm conflicts due to the last change above.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 14 Dec 2007 10:25:59 +0200
+
 kdebase-workspace (4:3.97.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/control	2007-12-14 00:58:24 UTC (rev 8231)
+++ branches/kde4/packages/kdebase-workspace/debian/control	2007-12-14 08:45:49 UTC (rev 8232)
@@ -8,7 +8,7 @@
  libraw1394-dev, libsensors-dev, libstrigiqtdbusclient-dev (>= 0.5.7), libusb-dev,
  libxkbfile-dev, libxcomposite-dev, libxdamage-dev, libxfixes-dev,
  libxklavier11-dev, libxrandr-dev, libxrender-dev, libxxf86misc-dev,
- network-manager-dev
+ network-manager-dev, libpam0g-dev
 Standards-Version: 3.7.3
 
 Package: kdebase-workspace
@@ -67,7 +67,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}, xbase-clients
-Conflicts: desktop-base (<< 4.0.4)
+Conflicts: desktop-base (<< 4.0.4), kdebase-workspace-bin (<< 4:3.97.0-2)
 Provides: x-display-manager
 Description: X display manager for KDE
  kdm manages a collection of X servers, which may be on the local host or

Modified: branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2007-12-14 00:58:24 UTC (rev 8231)
+++ branches/kde4/packages/kdebase-workspace/debian/kdebase-workspace-bin.install	2007-12-14 08:45:49 UTC (rev 8232)
@@ -61,8 +61,6 @@
 usr/lib/kde4/kcm_xinerama.so
 usr/lib/kde4/kded_khotkeys.so
 usr/lib/kde4/kded_networkstatus.so
-usr/lib/kde4/kgreet_classic.so
-usr/lib/kde4/kgreet_winbind.so
 usr/lib/kde4/krunner_bookmarksrunner.so
 usr/lib/kde4/krunner_calculatorrunner.so
 usr/lib/kde4/krunner_searchrunner.so

Modified: branches/kde4/packages/kdebase-workspace/debian/kdm.install
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/kdm.install	2007-12-14 00:58:24 UTC (rev 8231)
+++ branches/kde4/packages/kdebase-workspace/debian/kdm.install	2007-12-14 08:45:49 UTC (rev 8232)
@@ -11,6 +11,8 @@
 usr/bin/genkdmconf
 usr/bin/kdm
 usr/bin/kdmctl
+usr/lib/kde4/kgreet_classic.so
+usr/lib/kde4/kgreet_winbind.so
 usr/lib/kde4/libexec/kdm_config
 usr/lib/kde4/libexec/kdm_greet
 usr/lib/kde4/libexec/krootimage

Modified: branches/kde4/packages/kdebase-workspace/debian/rules
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/rules	2007-12-14 00:58:24 UTC (rev 8231)
+++ branches/kde4/packages/kdebase-workspace/debian/rules	2007-12-14 08:45:49 UTC (rev 8232)
@@ -2,3 +2,5 @@
 
 export LDFLAGS+="-Wl,--as-needed"
 include debian/cdbs/kde.mk
+
+DEB_CMAKE_EXTRA_FLAGS += -DKDE4_KDM_PAM_SERVICE=kdm