[SCM] Mumudvb packaging branch, master, updated. 1.5.2-68-gf634524
Stephane Glondu
steph at glondu.net
Tue Dec 9 09:14:16 UTC 2008
The following commit has been merged in the master branch:
commit 3f4dbbe1286d1cc20ac0df7415b40370a6436f29
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Dec 9 09:30:58 2008 +0100
Handle /var/run/mumudvb entirely in maintainer scripts
diff --git a/debian/mumudvb.postinst b/debian/mumudvb.postinst
index b778c43..93187f1 100644
--- a/debian/mumudvb.postinst
+++ b/debian/mumudvb.postinst
@@ -25,10 +25,8 @@ SYSTEM_HOME="/var/run/mumudvb"
case "$1" in
configure)
- adduser --system --home $SYSTEM_HOME --no-create-home \
+ adduser --system --home $SYSTEM_HOME \
--disabled-password --force-badname $SYSTEM_USER
- chown $SYSTEM_USER:nogroup -R $SYSTEM_HOME
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/mumudvb.postrm b/debian/mumudvb.postrm
index c2538f0..67b2a95 100644
--- a/debian/mumudvb.postrm
+++ b/debian/mumudvb.postrm
@@ -26,13 +26,9 @@ SYSTEM_HOME="/var/run/mumudvb"
case "$1" in
purge)
- # Ensure $SYSTEM_HOME doesn't exist anymore
- if [ -d "$SYSTEM_HOME" ]; then
- echo "$SYSTEM_HOME still exists, check manually"
- exit 2
- fi
-
- # Delete user and group
+ # Delete home (refused by deluser because in /var)
+ rm -Rf $SYSTEM_HOME
+ # Delete user
deluser $SYSTEM_USER
;;
diff --git a/debian/rules b/debian/rules
index 6bb3607..1b2c8ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,12 +16,14 @@ clean:
install: build
dh install --before dh_auto_install
$(MAKE) DESTDIR=$(CURDIR)/debian/mumudvb install
- # Install the man files
+# Install the man files
$(MAKE) DESTDIR=$(CURDIR)/debian/mumudvb install_man
+# Remove /var/run/mumudvb, will be created at postinst
+ rm -Rf $(CURDIR)/debian/mumudvb/var
dh install --after dh_auto_install
binary-indep: install
- dh $@
+ @echo No binary-indep package
binary-arch: install
dh $@
--
Mumudvb packaging
More information about the pkg-vdr-dvb-changes
mailing list