[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-1-34-g08536fc

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit 08536fc2b87af15b719fac394579271bd76b951b
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Tue Aug 3 14:16:28 2010 +0300

    Adjust the kdm postinst and postrm scripts to create/remove a kdm user.
---
 debian/changelog    |    3 +++
 debian/control      |    2 +-
 debian/kdm.postinst |    1 +
 debian/kdm.postrm   |    6 ++++++
 4 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4051d8..7bb8c5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ kdebase-workspace (4:4.5.0-0r1) UNRELEASED; urgency=low
     - libsolidcontrolifaces4 -> libsolidcontrolifaces4a
     - libtaskmanager4a -> libtaskmanager4b
   * Move the freespacenotifier package from src:freespacenotifier here.
+  * Adjust the kdm postinst and postrm scripts to create and remove (on purge)
+    a "kdm" user, which is now used by default as the user to run the greeter.
+    As a consequence, add dependency on adduser on the kdm package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/control b/debian/control
index 3a832e5..f7020d6 100644
--- a/debian/control
+++ b/debian/control
@@ -247,7 +247,7 @@ Package: kdm
 Section: x11
 Architecture: any
 Depends: ${shlibs:Depends}, debconf | debconf-2.0, lsb-base (>= 3.2-14), consolekit, ${misc:Depends},
- kdebase-workspace-kgreet-plugins (= ${binary:Version})
+ kdebase-workspace-kgreet-plugins (= ${binary:Version}), adduser
 Recommends: logrotate, xserver-xorg-core | xserver,
  kdebase | x-session-manager | x-window-manager, xterm | x-terminal-emulator
 Suggests: kdepasswd
diff --git a/debian/kdm.postinst b/debian/kdm.postinst
index 1756869..63f05b1 100644
--- a/debian/kdm.postinst
+++ b/debian/kdm.postinst
@@ -74,6 +74,7 @@ fi
 case "$1" in
 
   configure)
+    adduser --system --quiet --no-create-home kdm
   ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/kdm.postrm b/debian/kdm.postrm
index 464a070..1d19c0b 100644
--- a/debian/kdm.postrm
+++ b/debian/kdm.postrm
@@ -8,6 +8,12 @@ case "$1" in
                 rm -rf "$DIR"
             fi
         done
+
+        if [ -x "$(command -v deluser)" ]; then
+            deluser --system --quiet kdm || true
+        else
+            echo "not removing kdm system account because deluser command was not found" >&2
+        fi
     ;;
 
     abort-install|abort-upgrade)

-- 
KDE Base Workspace module packaging