[SCM] Mumudvb packaging branch, master, updated. 1.5.2-62-g932012d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 041cf195852fe138ef4676d9b0f2802679f1a340
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Dec 7 19:05:36 2008 +0100

    Use adduser and simplify maintainer scripts

diff --git a/debian/control b/debian/control
index 505b491..4fbe522 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/dvb/mumudvb.git
 
 Package: mumudvb
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: adduser, ${shlibs:Depends}
 Suggests: dvbtune
 Description: multicasts all channels of a DVB transponder on a network
  Mumudvb is a program that redistributes streams from DVB on a network
diff --git a/debian/mumudvb.default b/debian/mumudvb.default
index d4f6416..ff4538a 100644
--- a/debian/mumudvb.default
+++ b/debian/mumudvb.default
@@ -13,7 +13,7 @@ DONTSTARTMUMU=true
 DAEMON_OPTS=""
 
 #The user to launch mumudvb
-DAEMONUSER=mumudvb
+DAEMONUSER=_mumudvb
 
 #Change this line to reflect your configuration
 #Ex : ADAPTERS="0 1 2 4"
diff --git a/debian/mumudvb.postinst b/debian/mumudvb.postinst
index 3d9c637..b778c43 100644
--- a/debian/mumudvb.postinst
+++ b/debian/mumudvb.postinst
@@ -18,43 +18,16 @@ set -e
 # the debian-policy package
 
 # Some useful variables
-SYSTEM_USER="mumudvb"
+SYSTEM_USER="_mumudvb"
 SYSTEM_HOME="/var/run/mumudvb"
-CHOWN="/bin/chown"
-USERADD="/usr/sbin/useradd"
-GROUPADD="/usr/sbin/groupadd"
-ID="/usr/bin/id"
 
 
 case "$1" in
     configure)
 
-        # Get current uid and gid if user exists.
-        if $ID $SYSTEM_USER > /dev/null 2>&1; then
-            IUID=`$ID --user $SYSTEM_USER`
-            IGID=`$ID --group $SYSTEM_USER`
-        else
-            IUID="NONE"
-            IGID="NONE"
-        fi
-
-        # Ensure that no standard account or group remains before
-        # adding the new group/user.
-        if [ "$IUID" != "NONE" ] && [ $IUID -ge 1000 ]; then
-            echo "User $SYSTEM_USER already exists and is not a system user!"
-            exit 2
-        fi
-        if [ "$IGID" != "NONE" ] && [ $IGID -ge 1000 ]; then
-            echo "Group $SYSTEM_USER already exists and is not a system group!"
-            exit 2
-        fi
-
-        # Create group and user
-        $GROUPADD --system $SYSTEM_USER
-        $USERADD --system --home "$SYSTEM_HOME" --gid $SYSTEM_USER --no-user-group --shell /bin/false $SYSTEM_USER
-
-        # Change ownership of $SYSTEM_HOME
-        $CHOWN $SYSTEM_USER:$SYSTEM_USER -R "$SYSTEM_HOME"
+        adduser --system --home $SYSTEM_HOME --no-create-home \
+          --disabled-password --force-badname $SYSTEM_USER
+        chown $SYSTEM_USER:nogroup -R $SYSTEM_HOME
 
     ;;
 
diff --git a/debian/mumudvb.postrm b/debian/mumudvb.postrm
index 2120778..c2538f0 100644
--- a/debian/mumudvb.postrm
+++ b/debian/mumudvb.postrm
@@ -19,12 +19,8 @@ set -e
 # the debian-policy package
 
 # Some useful variables
-SYSTEM_USER="mumudvb"
+SYSTEM_USER="_mumudvb"
 SYSTEM_HOME="/var/run/mumudvb"
-USERDEL="/usr/sbin/userdel"
-GROUPDEL="/usr/sbin/groupdel"
-ID="/usr/bin/id"
-TRUE="/bin/true"
 
 
 case "$1" in
@@ -37,8 +33,7 @@ case "$1" in
         fi
 
         # Delete user and group
-        $USERDEL $SYSTEM_USER || $TRUE
-        $GROUPDEL $SYSTEM_USER || $TRUE
+        deluser $SYSTEM_USER
 
     ;;
 

-- 
Mumudvb packaging