r8593 - in /vdr/vdradmin-am/trunk/debian: ./ patches/ source/
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Sat May 1 23:49:56 UTC 2010
Author: tiber-guest
Date: Sat May 1 23:49:56 2010
New Revision: 8593
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8593
Log:
* New upstream release
* Updated 03_cfgfiles-fhs.dpatch and dropped 06_template-cache.dpatch
* Dropped because fixed upstream:
- 07_fix-need-recoding-detection.dpatch
- 08_fallback-to-ipv4.dpatch
- 09_Use-UTF-8-to-determine-required-encoding.dpatch
- 10_If-required-recode-commands-sent-to-VDR.dpatch
* Added source/format 1.0
Added:
vdr/vdradmin-am/trunk/debian/source/
vdr/vdradmin-am/trunk/debian/source/format
Removed:
vdr/vdradmin-am/trunk/debian/patches/06_template-cache.dpatch
vdr/vdradmin-am/trunk/debian/patches/07_fix-need-recoding-detection.dpatch
vdr/vdradmin-am/trunk/debian/patches/08_fallback-to-ipv4.dpatch
vdr/vdradmin-am/trunk/debian/patches/09_Use-UTF-8-to-determine-required-encoding.dpatch
vdr/vdradmin-am/trunk/debian/patches/10_If-required-recode-commands-sent-to-VDR.dpatch
Modified:
vdr/vdradmin-am/trunk/debian/changelog
vdr/vdradmin-am/trunk/debian/control
vdr/vdradmin-am/trunk/debian/patches/00list
vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
vdr/vdradmin-am/trunk/debian/postinst
vdr/vdradmin-am/trunk/debian/postrm
vdr/vdradmin-am/trunk/debian/rules
vdr/vdradmin-am/trunk/debian/vdradmin-am.dirs
vdr/vdradmin-am/trunk/debian/vdradmin-am.init
Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Sat May 1 23:49:56 2010
@@ -1,8 +1,16 @@
-vdradmin-am (3.6.5-6) UNRELEASED; urgency=low
-
+vdradmin-am (3.6.7-1) unstable; urgency=low
+
+ * New upstream release
* Renamed NEWS.Debian -> NEWS
-
- -- Tobias Grimm <etobi at debian.org> Sun, 07 Mar 2010 15:27:46 +0100
+ * Updated 03_cfgfiles-fhs.dpatch and dropped 06_template-cache.dpatch
+ * Dropped because fixed upstream:
+ - 07_fix-need-recoding-detection.dpatch
+ - 08_fallback-to-ipv4.dpatch
+ - 09_Use-UTF-8-to-determine-required-encoding.dpatch
+ - 10_If-required-recode-commands-sent-to-VDR.dpatch
+ * Added source/format 1.0
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 02 May 2010 01:49:48 +0200
vdradmin-am (3.6.5-5) unstable; urgency=low
Modified: vdr/vdradmin-am/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/control?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/control (original)
+++ vdr/vdradmin-am/trunk/debian/control Sat May 1 23:49:56 2010
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 7), dpatch
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
Modified: vdr/vdradmin-am/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/00list?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Sat May 1 23:49:56 2010
@@ -1,8 +1,3 @@
01_dist-var
02_search-path.dpatch
03_cfgfiles-fhs
-06_template-cache
-07_fix-need-recoding-detection
-08_fallback-to-ipv4
-09_Use-UTF-8-to-determine-required-encoding
-10_If-required-recode-commands-sent-to-VDR
Modified: vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch (original)
+++ vdr/vdradmin-am/trunk/debian/patches/03_cfgfiles-fhs.dpatch Sat May 1 23:49:56 2010
@@ -6,10 +6,10 @@
## DP: with the FHS (vdradmin changes these files at runtime)
@DPATCH@
-diff -urNad vdradmin-am-3.6.2~/vdradmind.pl vdradmin-am-3.6.2/vdradmind.pl
---- vdradmin-am-3.6.2~/vdradmind.pl 2008-08-01 20:51:48.000000000 +0200
-+++ vdradmin-am-3.6.2/vdradmind.pl 2008-08-01 20:52:56.000000000 +0200
-@@ -132,9 +132,9 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdradmin-am-3.6.7~/vdradmind.pl vdradmin-am-3.6.7/vdradmind.pl
+--- vdradmin-am-3.6.7~/vdradmind.pl 2010-05-02 01:33:41.000000000 +0200
++++ vdradmin-am-3.6.7/vdradmind.pl 2010-05-02 01:34:30.000000000 +0200
+@@ -141,9 +141,9 @@
$CONFIG{SERVERHOST} = "0.0.0.0";
$CONFIG{SERVERPORT} = 8001;
$CONFIG{LOCAL_NET} = "0.0.0.0/32";
@@ -22,25 +22,28 @@
#
$CONFIG{TEMPLATE} = "default";
-@@ -261,15 +261,15 @@
+@@ -279,18 +279,18 @@
+ $USER_CSS = "${BASENAME}user.css";
bindtextdomain("vdradmin", "${BASENAME}locale");
} else {
- $ETCDIR = "/etc/vdradmin";
+- $ETCDIR = "/etc/vdradmin";
+- $CERTSDIR = "${ETCDIR}/certs";
- $TEMPLATEDIR = "/usr/share/vdradmin/template";
+- $TEMPLATECACHE = "/var/cache/vdradmin";
+- $LOGDIR = "/var/log/vdradmin";
+- $PIDFILE = "/var/run/vdradmin/vdradmind.pid";
++ $ETCDIR = "/var/lib/vdradmin-am";
++ $CERTSDIR = "/etc/vdradmin-am/certs";
+ $TEMPLATEDIR = "/usr/share/vdradmin-am/template";
- $LOGDIR = "/var/log";
- $PIDFILE = "/var/run/vdradmind.pid";
-- $CONFFILE = "${ETCDIR}/vdradmind.conf";
-- $AT_FILENAME = "${ETCDIR}/vdradmind.at";
-- $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
-- $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
-- $USER_CSS = "${ETCDIR}/user.css";
++ $TEMPLATECACHE = "/var/cache/vdradmin-am";
++ $LOGDIR = "/var/log/vdradmin-am";
++ $PIDFILE = "/var/run/vdradmin-am/vdradmind.pid";
+ $CONFFILE = "${ETCDIR}/vdradmind.conf";
+ $AT_FILENAME = "${ETCDIR}/vdradmind.at";
+ $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
+ $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
+ $USER_CSS = "${ETCDIR}/user.css";
- bindtextdomain("vdradmin", "/usr/share/locale");
-+ $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 = "/var/lib/vdradmin-am/user.css";
+ #bindtextdomain("vdradmin", "/usr/share/locale");
}
my $DONE = &DONE_Read || {};
Modified: vdr/vdradmin-am/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/postinst?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/postinst (original)
+++ vdr/vdradmin-am/trunk/debian/postinst Sat May 1 23:49:56 2010
@@ -37,18 +37,18 @@
USER=vdradmin-am
GROUP=vdradmin-am
if ! getent group | grep -q "^$GROUP:" ; then
- echo -n "Adding group $GROUP.."
- addgroup --quiet --system $GROUP
- echo "..done"
+ echo -n "Adding group $GROUP.."
+ addgroup --quiet --system $GROUP
+ echo "..done"
fi
if ! getent passwd | grep -q "^$USER:"; then
- echo -n "Adding user $USER.."
- adduser --system --home /var/lib/vdradmin-am --shell /bin/false \
- --gecos "VDRAdmin-am user" --no-create-home \
- --disabled-login --disabled-password \
- --ingroup $GROUP \
- $USER
- echo "...done"
+ echo -n "Adding user $USER.."
+ adduser --system --home /var/lib/vdradmin-am --shell /bin/false \
+ --gecos "VDRAdmin-am user" --no-create-home \
+ --disabled-login --disabled-password \
+ --ingroup $GROUP \
+ $USER
+ echo "...done"
fi
# ensure vdradmind.at (auto timers) exists
@@ -76,7 +76,9 @@
fi
fi
-# ensure that vdradmin's template cache has the correct owner
-[ ! -d /var/cache/vdradmin-am ] || chown -R $USER:$GROUP /var/cache/vdradmin-am/
-
+# ensure that vdradmin's directories have the correct owner
+for dir in /var/cache/vdradmin-am /var/log/vdradmin-am /var/lib/vdradmin-am; do
+ [ ! -d $dir ] || chown -R $USER:$GROUP $dir
+done
+
##DEBHELPER##
Modified: vdr/vdradmin-am/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/postrm?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/postrm (original)
+++ vdr/vdradmin-am/trunk/debian/postrm Sat May 1 23:49:56 2010
@@ -3,19 +3,21 @@
case "$1" in
purge)
- 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-am/vdradmind.conf > /dev/null 2>&1 || true
- rm -rf /var/cache/vdradmin-am > /dev/null 2>&1 || true
-
+ for dir in /var/cache/vdradmin-am /var/log/vdradmin-am /var/lib/vdradmin-am /var/run/vdradmin-am; do
+ rm -rf $dir > /dev/null 2>&1 || true
+ done
+ 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-am/vdradmind.conf > /dev/null 2>&1 || true
+
if [ -L /etc/vdradmin/vdradmind.conf ]; then
rm -f /etc/vdradmin/vdradmind.conf > /dev/null 2>&1 || true
fi
- chown root:root /var/log/vdradmind.log > /dev/null 2>&1 || true
-
- deluser vdradmin-am > /dev/null || true
+ chown root:root /var/log/vdradmind.log > /dev/null 2>&1 || true
+
+ deluser vdradmin-am > /dev/null || true
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
Modified: vdr/vdradmin-am/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/rules?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/rules (original)
+++ vdr/vdradmin-am/trunk/debian/rules Sat May 1 23:49:56 2010
@@ -30,7 +30,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
Added: vdr/vdradmin-am/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/source/format?rev=8593&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/source/format (added)
+++ vdr/vdradmin-am/trunk/debian/source/format Sat May 1 23:49:56 2010
@@ -1,0 +1,1 @@
+1.0
Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.dirs
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.dirs?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.dirs (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.dirs Sat May 1 23:49:56 2010
@@ -1,3 +1,5 @@
+etc/vdradmin-am
+etc/vdradmin-am/certs
+var/cache/vdradmin-am
var/lib/vdradmin-am
-etc/vdradmin-am
-var/cache/vdradmin-am
+var/log/vdradmin-am
Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.init
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.init?rev=8593&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.init (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.init Sat May 1 23:49:56 2010
@@ -22,7 +22,7 @@
DAEMON=/usr/bin/vdradmind
NAME=vdradmind
DESC="VDR Webadministration interface"
-PIDFILE=/var/run/vdradmin.pid
+PIDFILE=/var/run/vdradmin-am/vdradmin.pid
NICE="10"
test -x $DAEMON || exit 0
@@ -35,6 +35,10 @@
fi
set -e
+
+# Ensure run dir exists and is correctly owned
+mkdir -p /var/run/vdradmin-am
+chown -R $USER:$GROUP /var/run/vdradmin-am
# Check if the logfile exists allready, if not, create it and set
# group and owner to $USER:$GROUP
@@ -99,20 +103,20 @@
case "$1" in
start)
- start_daemon
+ start_daemon
;;
stop)
stop_daemon
;;
- restart|force-reload)
+ restart|force-reload)
stop_daemon
start_daemon
;;
- status)
+ status)
echo -n "Getting status of $DESC: $NAME"
get_status
;;
- *)
+ *)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
More information about the pkg-vdr-dvb-changes
mailing list