r2016 - in vdr/vdradmin/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Mon Mar 13 20:04:09 UTC 2006
Author: tschmidt
Date: 2006-03-13 20:04:07 +0000 (Mon, 13 Mar 2006)
New Revision: 2016
Removed:
vdr/vdradmin/trunk/debian/prerm
Modified:
vdr/vdradmin/trunk/debian/changelog
vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
vdr/vdradmin/trunk/debian/postinst
vdr/vdradmin/trunk/debian/postrm
vdr/vdradmin/trunk/debian/vdradmin-am.dirs
vdr/vdradmin/trunk/debian/vdradmin-am.install
Log:
vdradmin: move cfg-files from /var/lib/vdradmin to /var/lib/vdradmin-am; use /usr/share/vdradmin-am instead of /usr/share/vdradmin
Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/changelog 2006-03-13 20:04:07 UTC (rev 2016)
@@ -8,7 +8,9 @@
files to the new format of vdr>=1.3.44
- Updated 02_sectmpfiles.dpatch to change the path of the temporary
template dir to a safe location too (closes: #356402)
- - Delete /var/lib/vdradmin/vdradmind.done too, when purging the package
+ - Moving configuration files from /var/lib/vdradmin/ to
+ /var/lib/vdradmin-am when upgrading the package
+ - Delete /var/lib/vdradmin-am/vdradmind.done too, when purging the package
-- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 12 Mar 2006 20:00:06 +0100
Modified: vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch
===================================================================
--- vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/patches/03_cfgfiles-fhs.dpatch 2006-03-13 20:04:07 UTC (rev 2016)
@@ -6,10 +6,10 @@
## DP: with the FHS (vdradmin changes these files at runtime)
@DPATCH@
-diff -urNad vdradmin-0.97-am3.4.2/vdradmind.pl /tmp/dpep.eh14eS/vdradmin-0.97-am3.4.2/vdradmind.pl
---- vdradmin-0.97-am3.4.2/vdradmind.pl 2005-12-08 16:27:14.264423500 +0100
-+++ /tmp/dpep.eh14eS/vdradmin-0.97-am3.4.2/vdradmind.pl 2005-12-08 16:28:30.929214750 +0100
-@@ -104,9 +104,9 @@
+diff -urNad vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl /tmp/dpep.YLYoja/vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl
+--- vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl 2006-03-13 20:39:52.620545750 +0100
++++ /tmp/dpep.YLYoja/vdradmin-am-3.4.3+3.4.4beta/vdradmind.pl 2006-03-13 20:41:16.669798500 +0100
+@@ -110,9 +110,9 @@
$CONFIG{SERVERHOST} = "0.0.0.0";
$CONFIG{SERVERPORT} = 8001;
$CONFIG{LOCAL_NET} = "0.0.0.0/32";
@@ -22,18 +22,22 @@
$CONFIG{VDRVFAT} = 1;
#
$CONFIG{TEMPLATE} = "default";
-@@ -195,12 +195,12 @@
- $TEMPLATEDIR = "/usr/share/vdradmin/template";
+@@ -202,15 +202,15 @@
+ bindtextdomain("vdradmin", "${BASENAME}locale");
+ } else {
+ $ETCDIR = "/etc/vdradmin";
+- $TEMPLATEDIR = "/usr/share/vdradmin/template";
++ $TEMPLATEDIR = "/usr/share/vdradmin-am/template";
$LOGFILE = "/var/log/$CONFIG{LOGFILE}";
$PIDFILE = "/var/run/vdradmind.pid";
- $CONFFILE = "${ETCDIR}/vdradmind.conf";
- $AT_FILENAME = "${ETCDIR}/vdradmind.at";
- $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
- $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
-+ $CONFFILE = "/var/lib/vdradmin/vdradmind.conf";
-+ $AT_FILENAME = "/var/lib/vdradmin/vdradmind.at";
-+ $DONE_FILENAME = "/var/lib/vdradmin/vdradmind.done";
-+ $BL_FILENAME = "/var/lib/vdradmin/vdradmind.bl";
++ $CONFFILE = "/var/lib/vdradmin-am/vdradmind.conf";
++ $AT_FILENAME = "/var/lib/vdradmin-am/vdradmind.at";
++ $DONE_FILENAME = "/var/lib/vdradmin-am/vdradmind.done";
++ $BL_FILENAME = "/var/lib/vdradmin-am/vdradmind.bl";
$USER_CSS = "${ETCDIR}/user.css";
- bindtextdomain("vdradmin", "/usr/share/locale");
+# bindtextdomain("vdradmin", "/usr/share/locale");
Modified: vdr/vdradmin/trunk/debian/postinst
===================================================================
--- vdr/vdradmin/trunk/debian/postinst 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/postinst 2006-03-13 20:04:07 UTC (rev 2016)
@@ -1,23 +1,37 @@
#!/bin/sh -e
set -e
-# Check if there are still cfgfiles in /etc/vdradmin/ and move them
-# to /var/lib/vdradmin
-if [ ! -f /var/lib/vdradmin/vdradmind.conf ]; then
- if [ -f /etc/vdradmin/vdradmind.conf ]; then
- mv /etc/vdradmin/vdradmind.conf /var/lib/vdradmin/
+# Check if there are still cfgfiles in /var/lib/vdradmin/ and move them
+# to /var/lib/vdradmin-am
+if [ ! -f /var/lib/vdradmin-am/vdradmind.conf ]; then
+ if [ -f /var/lib/vdradmin/vdradmind.conf ]; then
+ mv /var/lib/vdradmin/vdradmind.conf /var/lib/vdradmin-am/
else
- cp /usr/share/doc/vdradmin-am/examples/vdradmind.conf /var/lib/vdradmin/
+ cp /usr/share/doc/vdradmin-am/examples/vdradmind.conf /var/lib/vdradmin-am/
fi
fi
-[ -e /etc/vdradmin/vdradmind.conf ] || ln -s /var/lib/vdradmin/vdradmind.conf \
+[ -e /etc/vdradmin/vdradmind.conf ] || ln -s /var/lib/vdradmin-am/vdradmind.conf \
/etc/vdradmin/vdradmind.conf
-if [ ! -f /var/lib/vdradmin/vdradmind.at ]; then
- [ ! -f /etc/vdradmin/vdradmind.at ] || mv /etc/vdradmin/vdradmind.at /var/lib/vdradmin/
+if [ ! -f /var/lib/vdradmin-am/vdradmind.at ]; then
+ if [ -f /var/lib/vdradmin/vdradmind.at ]; then
+ mv /var/lib/vdradmin/vdradmind.at /var/lib/vdradmin-am/
+ fi
fi
+if [ ! -f /var/lib/vdradmin-am/vdradmind.done ]; then
+ if [ -f /var/lib/vdradmin/vdradmind.done ]; then
+ mv /var/lib/vdradmin/vdradmind.done /var/lib/vdradmin-am/
+ fi
+fi
+
+if [ ! -f /var/lib/vdradmin-am/vdradmind.bl ]; then
+ if [ -f /var/lib/vdradmin/vdradmind.bl ]; then
+ mv /var/lib/vdradmin/vdradmind.bl /var/lib/vdradmin-am/
+ fi
+fi
+
# ensure that user and group 'vdradmin' exist
USER=vdradmin
GROUP=vdradmin
@@ -28,7 +42,7 @@
fi
if ! getent passwd | grep -q "^$USER:"; then
echo -n "Adding user $USER.."
- adduser --system --home /var/lib/vdradmin --shell /bin/false \
+ adduser --system --home /var/lib/vdradmin-am --shell /bin/false \
--gecos "VDRAdmin user" --no-create-home \
--disabled-login --disabled-password \
--ingroup $GROUP \
@@ -37,14 +51,14 @@
fi
# ensure vdradmind.at (auto timers) exists
-ATFILE=/var/lib/vdradmin/vdradmind.at
+ATFILE=/var/lib/vdradmin-am/vdradmind.at
[ -e $ATFILE ] || touch $ATFILE
# ensure that vdradmin's config files have the correct owner
-[ ! -d /var/lib/vdradmin ] || chown -R $USER:$GROUP /var/lib/vdradmin/
+[ ! -d /var/lib/vdradmin-am ] || chown -R $USER:$GROUP /var/lib/vdradmin-am/
# change the permissions of the cfg-file to 0600
-[ ! -e /var/lib/vdradmin/vdradmind.conf ] || chmod 0600 /var/lib/vdradmin/vdradmind.conf
+[ ! -e /var/lib/vdradmin-am/vdradmind.conf ] || chmod 0600 /var/lib/vdradmin-am/vdradmind.conf
# change the owner and group of the logfile to vdradmin
[ ! -e /var/log/vdradmind.log ] || chown $USER:$GROUP /var/log/vdradmind.log
@@ -52,11 +66,11 @@
# make auto timer file "read/writeable" by group vdr and config file readable
# by group "vdr",so that vdr plugins (Autotimeredit plugin) get access
if getent group | grep -q "^vdr:" ; then
- if [ -d /var/lib/vdradmin ] ; then
- chgrp -R vdr /var/lib/vdradmin
- chmod a=,ug=rwx /var/lib/vdradmin
+ if [ -d /var/lib/vdradmin-am ] ; then
+ chgrp -R vdr /var/lib/vdradmin-am
+ chmod a=,ug=rwx /var/lib/vdradmin-am
chmod a=,ug=rw $ATFILE
- CFGFILE=/var/lib/vdradmin/vdradmind.conf
+ CFGFILE=/var/lib/vdradmin-am/vdradmind.conf
[ -e $CFGFILE ] && chmod a=,u=rw,g=r $CFGFILE
fi
fi
Modified: vdr/vdradmin/trunk/debian/postrm
===================================================================
--- vdr/vdradmin/trunk/debian/postrm 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/postrm 2006-03-13 20:04:07 UTC (rev 2016)
@@ -3,9 +3,9 @@
case "$1" in
purge)
- rm -f /var/lib/vdradmin/vdradmind.conf > /dev/null 2>&1 || true
- rm -f /var/lib/vdradmin/vdradmind.at > /dev/null 2>&1 || true
- rm -f /var/lib/vdradmin/vdradmind.done > /dev/null 2>&1 || true
+ rm -f /var/lib/vdradmin-am/vdradmind.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdradmin-am/vdradmind.at > /dev/null 2>&1 || true
+ rm -f /var/lib/vdradmin-am/vdradmind.done > /dev/null 2>&1 || true
rm -f /etc/vdradmin/vdradmind.conf > /dev/null 2>&1 || true
chown root:root /var/log/vdradmind.log > /dev/null 2>&1 || true
Deleted: vdr/vdradmin/trunk/debian/prerm
===================================================================
--- vdr/vdradmin/trunk/debian/prerm 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/prerm 2006-03-13 20:04:07 UTC (rev 2016)
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-set -e
-
-TEMPLATE_DIR=/usr/share/vdradmin/template
-
-test -L $TEMPLATE_DIR/English/bilder && rm -f $TEMPLATE_DIR/English/bilder
-test -L $TEMPLATE_DIR/French/bilder && rm -f $TEMPLATE_DIR/French/bilder
-
-##DEBHELPER##
Modified: vdr/vdradmin/trunk/debian/vdradmin-am.dirs
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin-am.dirs 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/vdradmin-am.dirs 2006-03-13 20:04:07 UTC (rev 2016)
@@ -1,2 +1,2 @@
-var/lib/vdradmin
+var/lib/vdradmin-am
etc/vdradmin
Modified: vdr/vdradmin/trunk/debian/vdradmin-am.install
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin-am.install 2006-03-13 19:25:21 UTC (rev 2015)
+++ vdr/vdradmin/trunk/debian/vdradmin-am.install 2006-03-13 20:04:07 UTC (rev 2016)
@@ -1,6 +1,6 @@
locale/ usr/share/
-template/ usr/share/vdradmin/
-convert.pl usr/share/vdradmin/
+template/ usr/share/vdradmin-am/
+convert.pl usr/share/vdradmin-am/
vdradmind.pl usr/bin/
debian/vdradmind.pl.1 usr/share/man/man1/
More information about the pkg-vdr-dvb-changes
mailing list