r462 - vdr/vdr/trunk/debian
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sat, 16 Apr 2005 06:57:02 +0000
Author: tschmidt
Date: 2005-04-16 06:56:56 +0000 (Sat, 16 Apr 2005)
New Revision: 462
Modified:
vdr/vdr/trunk/debian/vdr-plugin-examples.install
vdr/vdr/trunk/debian/vdr-plugin-examples.links
vdr/vdr/trunk/debian/vdr.init
vdr/vdr/trunk/debian/vdr.install
vdr/vdr/trunk/debian/vdr.postinst
vdr/vdr/trunk/debian/vdr.postrm
Log:
vdr: Use tabs instead of spaces as suggested by Thomas G?\195?\188nther
Modified: vdr/vdr/trunk/debian/vdr-plugin-examples.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-plugin-examples.install 2005-04-15 21:20:59 UTC (rev 461)
+++ vdr/vdr/trunk/debian/vdr-plugin-examples.install 2005-04-16 06:56:56 UTC (rev 462)
@@ -1,3 +1,3 @@
-PLUGINS/lib/libvdr-hello.so.* usr/lib/vdr/plugins/
+PLUGINS/lib/libvdr-hello.so.* usr/lib/vdr/plugins/
PLUGINS/lib/libvdr-osddemo.so.* usr/lib/vdr/plugins/
-PLUGINS/lib/libvdr-status.so.* usr/lib/vdr/plugins/
+PLUGINS/lib/libvdr-status.so.* usr/lib/vdr/plugins/
Modified: vdr/vdr/trunk/debian/vdr-plugin-examples.links
===================================================================
--- vdr/vdr/trunk/debian/vdr-plugin-examples.links 2005-04-15 21:20:59 UTC (rev 461)
+++ vdr/vdr/trunk/debian/vdr-plugin-examples.links 2005-04-16 06:56:56 UTC (rev 462)
@@ -1,2 +1,2 @@
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-plugin-examples.1.gz
-usr/share/doc/vdr usr/share/doc/vdr-plugin-examples
+usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-plugin-examples.1.gz
+usr/share/doc/vdr usr/share/doc/vdr-plugin-examples
Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init 2005-04-15 21:20:59 UTC (rev 461)
+++ vdr/vdr/trunk/debian/vdr.init 2005-04-16 06:56:56 UTC (rev 462)
@@ -12,7 +12,7 @@
DESC="Linux Video Disk Recorder"
test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown.wrapper" \
- || VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown-message"
+ || VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown-message"
test "$ENABLED" != "0" || exit 0
@@ -23,17 +23,17 @@
# and just as vdr in the c't-vdr packages)
if ! ps ax | grep "/usr/bin/\(vdr\|vdr-kbd\) " | grep -qv grep
then
- . /usr/lib/vdr/plugin-loader.sh
- . /usr/lib/vdr/commands-loader.sh
- getplugins
- mergecommands "commands"
- mergecommands "reccmds"
- start-stop-daemon --start --quiet \
- --exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
- -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
- $OPTIONS $PLUGINS &
+ . /usr/lib/vdr/plugin-loader.sh
+ . /usr/lib/vdr/commands-loader.sh
+ getplugins
+ mergecommands "commands"
+ mergecommands "reccmds"
+ start-stop-daemon --start --quiet \
+ --exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
+ -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
+ $OPTIONS $PLUGINS &
else
- echo -n " - seems to be running already"
+ echo -n " - seems to be running already"
fi
}
@@ -53,27 +53,27 @@
case "$1" in
start)
- echo -n "Starting $DESC: $NAME"
- startvdr
- echo "."
- ;;
+ echo -n "Starting $DESC: $NAME"
+ startvdr
+ echo "."
+ ;;
stop)
- echo -n "Stopping $DESC: $NAME"
- stopvdr
- echo "."
- ;;
+ echo -n "Stopping $DESC: $NAME"
+ stopvdr
+ echo "."
+ ;;
restart|force-reload)
- echo -n "Restarting $DESC: $NAME"
- stopvdr
- sleep 4
- startvdr
- echo "."
- ;;
+ echo -n "Restarting $DESC: $NAME"
+ stopvdr
+ sleep 4
+ startvdr
+ echo "."
+ ;;
*)
- N=/etc/init.d/$NAME
- echo "Use: $N {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ echo "Use: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
esac
exit 0
Modified: vdr/vdr/trunk/debian/vdr.install
===================================================================
--- vdr/vdr/trunk/debian/vdr.install 2005-04-15 21:20:59 UTC (rev 461)
+++ vdr/vdr/trunk/debian/vdr.install 2005-04-16 06:56:56 UTC (rev 462)
@@ -1,4 +1,4 @@
-vdr-kbd usr/bin/
+vdr-kbd usr/bin/
debian/scripts/vdr-daemon usr/bin/
debian/scripts/vdr-lirc usr/bin/
debian/scripts/vdr-rcu usr/bin/
@@ -13,15 +13,15 @@
debian/order.commands.conf etc/vdr/command-hooks/
debian/order.reccmds.conf etc/vdr/command-hooks/
-debian/commands.custom.conf etc/vdr/command-hooks/
-debian/commands.update-recordings.conf etc/vdr/command-hooks/
-debian/reccmds.custom.conf etc/vdr/command-hooks/
+debian/commands.custom.conf etc/vdr/command-hooks/
+debian/commands.update-recordings.conf etc/vdr/command-hooks/
+debian/reccmds.custom.conf etc/vdr/command-hooks/
debian/config-loader.sh usr/lib/vdr
debian/plugin-loader.sh usr/lib/vdr
debian/commands-loader.sh usr/lib/vdr
-ca.conf etc/vdr/
+ca.conf etc/vdr/
diseqc.conf etc/vdr/
keymacros.conf etc/vdr/
sources.conf etc/vdr/
Modified: vdr/vdr/trunk/debian/vdr.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr.postinst 2005-04-15 21:20:59 UTC (rev 461)
+++ vdr/vdr/trunk/debian/vdr.postinst 2005-04-16 06:56:56 UTC (rev 462)
@@ -28,137 +28,137 @@
case "$1" in
configure)
-
- . /usr/share/debconf/confmodule
-
- # Try to stop vdr a second time when we are upgrading
- # from a version smaller 1.2.6-9, because the init-script
- # of the old version can not stop vdr without a existing
- # /usr/bin/vdr
- if [ ! -z $2 ]; then
- if `dpkg --compare-versions $2 lt 1.2.6-9`; then
- if [ -x "/etc/init.d/vdr" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d vdr stop || exit 0
- else
- /etc/init.d/vdr stop || exit 0
- fi
- fi
- fi
- fi
-
- # move cfg-files from /etc/vdr to /var/lib/vdr
- for FILE in remote.conf setup.conf timers.conf; do
- if [ -e /etc/vdr/$FILE ] && [ ! -e /var/lib/vdr/$FILE ]; then
- printf "Note: Moving /etc/vdr/$FILE to /var/lib/vdr/$FILE\n"
- mv /etc/vdr/$FILE /var/lib/vdr/$FILE
- fi
- done
-
- # install/move channels.conf
- if [ ! -e /var/lib/vdr/channels.conf ]; then
- if [ -e /etc/vdr/channels.conf ]; then
- printf "Note: Moving /etc/vdr/channels.conf to /var/lib/vdr/channels.conf\n"
- mv /etc/vdr/channels.conf /var/lib/vdr/channels.conf
- else
- db_get vdr/select_dvb_card
-
- case "$RET" in
- Satellite)
- gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz \
- > /var/lib/vdr/channels.conf
- chmod 644 /var/lib/vdr/channels.conf
- ;;
- Terrestrial)
- gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz \
- > /var/lib/vdr/channels.conf
- chmod 644 /var/lib/vdr/channels.conf
- ;;
- Cable)
- gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz \
- > /var/lib/vdr/channels.conf
- chmod 644 /var/lib/vdr/channels.conf
- ;;
- esac
- fi
- fi
-
- # create needed devices nodes
- if [ ! -e /dev/dvb/ ]; then
- echo -n "Creating DVB-Devices: "
- cd /dev && MAKEDEV dvb
- echo "done."
- fi
+
+ . /usr/share/debconf/confmodule
+
+ # Try to stop vdr a second time when we are upgrading
+ # from a version smaller 1.2.6-9, because the init-script
+ # of the old version can not stop vdr without a existing
+ # /usr/bin/vdr
+ if [ ! -z $2 ]; then
+ if `dpkg --compare-versions $2 lt 1.2.6-9`; then
+ if [ -x "/etc/init.d/vdr" ]; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d vdr stop || exit 0
+ else
+ /etc/init.d/vdr stop || exit 0
+ fi
+ fi
+ fi
+ fi
+
+ # move cfg-files from /etc/vdr to /var/lib/vdr
+ for FILE in remote.conf setup.conf timers.conf; do
+ if [ -e /etc/vdr/$FILE ] && [ ! -e /var/lib/vdr/$FILE ]; then
+ printf "Note: Moving /etc/vdr/$FILE to /var/lib/vdr/$FILE\n"
+ mv /etc/vdr/$FILE /var/lib/vdr/$FILE
+ fi
+ done
+
+ # install/move channels.conf
+ if [ ! -e /var/lib/vdr/channels.conf ]; then
+ if [ -e /etc/vdr/channels.conf ]; then
+ printf "Note: Moving /etc/vdr/channels.conf to /var/lib/vdr/channels.conf\n"
+ mv /etc/vdr/channels.conf /var/lib/vdr/channels.conf
+ else
+ db_get vdr/select_dvb_card
+
+ case "$RET" in
+ Satellite)
+ gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz \
+ > /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
+ ;;
+ Terrestrial)
+ gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz \
+ > /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
+ ;;
+ Cable)
+ gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz \
+ > /var/lib/vdr/channels.conf
+ chmod 644 /var/lib/vdr/channels.conf
+ ;;
+ esac
+ fi
+ fi
+
+ # create needed devices nodes
+ if [ ! -e /dev/dvb/ ]; then
+ echo -n "Creating DVB-Devices: "
+ cd /dev && MAKEDEV dvb
+ echo "done."
+ fi
- db_get vdr/create_video_dir
- if $RET; then
- # check if an old directory /var/lib/video exists, and
- # symlink it to /var/lib/video.00
- if [ -d /var/lib/video ] && [ ! -e /var/lib/video.00 ]; then
- ln -s video /var/lib/video.00
- fi
+ db_get vdr/create_video_dir
+ if $RET; then
+ # check if an old directory /var/lib/video exists, and
+ # symlink it to /var/lib/video.00
+ if [ -d /var/lib/video ] && [ ! -e /var/lib/video.00 ]; then
+ ln -s video /var/lib/video.00
+ fi
- # create /var/lib/video.00 if it does not exist
- if [ ! -e /var/lib/video.00 ]; then
- mkdir /var/lib/video.00
- fi
+ # create /var/lib/video.00 if it does not exist
+ if [ ! -e /var/lib/video.00 ]; then
+ mkdir /var/lib/video.00
+ fi
- # check if /var/lib/video.00 exists and /var/lib/video is
- # missing, then create the symlink /var/lib/video which
- # points to /var/lib/video.00
- if [ ! -e /var/lib/video ] && [ -e /var/lib/video.00 ]; then
- ln -s video.00 /var/lib/video
- fi
- fi
+ # check if /var/lib/video.00 exists and /var/lib/video is
+ # missing, then create the symlink /var/lib/video which
+ # points to /var/lib/video.00
+ if [ ! -e /var/lib/video ] && [ -e /var/lib/video.00 ]; then
+ ln -s video.00 /var/lib/video
+ fi
+ fi
- # ensure that user and group 'vdr' exist
- USER=vdr
- GROUP=vdr
- if ! getent group | grep -q "^$GROUP:" ; then
- echo -n "Adding group $GROUP.."
- addgroup --quiet --system $GROUP
- echo "..done"
+ # ensure that user and group 'vdr' exist
+ USER=vdr
+ GROUP=vdr
+ if ! getent group | grep -q "^$GROUP:" ; then
+ 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/vdr --shell /bin/false \
- --gecos "VDR user" --no-create-home \
- --disabled-login --disabled-password \
- --ingroup $GROUP \
- $USER
- echo "...done"
- fi
-
- # put vdr in group video so that it can access the DVB device nodes
- adduser $USER video > /dev/null || true
+ if ! getent passwd | grep -q "^$USER:"; then
+ echo -n "Adding user $USER.."
+ adduser --system --home /var/lib/vdr --shell /bin/false \
+ --gecos "VDR user" --no-create-home \
+ --disabled-login --disabled-password \
+ --ingroup $GROUP \
+ $USER
+ echo "...done"
+ fi
+
+ # put vdr in group video so that it can access the DVB device nodes
+ adduser $USER video > /dev/null || true
- # put vdr in group cdrom so that it can access the cdrom and dvd
- # device nodes
- adduser $USER cdrom > /dev/null || true
+ # put vdr in group cdrom so that it can access the cdrom and dvd
+ # device nodes
+ adduser $USER cdrom > /dev/null || true
- # ensure that vdr's config and recording files are correctly owned
- [ -e /var/lib/video ] && chown -R $USER:$GROUP /var/lib/video/
- if [ -e /var/lib/vdr ] ; then
+ # ensure that vdr's config and recording files are correctly owned
+ [ -e /var/lib/video ] && chown -R $USER:$GROUP /var/lib/video/
+ if [ -e /var/lib/vdr ] ; then
chown $USER:$GROUP /var/lib/vdr
- chown $USER:$GROUP /var/lib/vdr/* > /dev/null 2>&1 || true
+ chown $USER:$GROUP /var/lib/vdr/* > /dev/null 2>&1 || true
fi
- if [ -e /var/cache/vdr ] ; then
+ if [ -e /var/cache/vdr ] ; then
chown $USER:$GROUP /var/cache/vdr
- chown $USER:$GROUP /var/cache/vdr/* > /dev/null 2>&1|| true
+ chown $USER:$GROUP /var/cache/vdr/* > /dev/null 2>&1|| true
fi
- # make /usr/lib/vdr/vdr-shutdown.wrapper setuid/setgid
+ # make /usr/lib/vdr/vdr-shutdown.wrapper setuid/setgid
# (owner root:vdr, mode 6750)
- if [ -e /usr/lib/vdr/vdr-shutdown.wrapper ] ; then
- chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
- chmod 6750 /usr/lib/vdr/vdr-shutdown.wrapper
+ if [ -e /usr/lib/vdr/vdr-shutdown.wrapper ] ; then
+ chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
+ chmod 6750 /usr/lib/vdr/vdr-shutdown.wrapper
fi
- # Install alternatives for the different control methods
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-lirc 120
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-kbd 110
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-rcu 105
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-daemon 100
+ # Install alternatives for the different control methods
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-lirc 120
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-kbd 110
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-rcu 105
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-daemon 100
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: vdr/vdr/trunk/debian/vdr.postrm
===================================================================
--- vdr/vdr/trunk/debian/vdr.postrm 2005-04-15 21:20:59 UTC (rev 461)
+++ vdr/vdr/trunk/debian/vdr.postrm 2005-04-16 06:56:56 UTC (rev 462)
@@ -20,13 +20,13 @@
case "$1" in
purge)
- rm -f /var/cache/vdr/commands.conf > /dev/null 2>&1 || true
- rm -f /var/cache/vdr/reccmds.conf > /dev/null 2>&1 || true
- rm -f /var/cache/vdr/epg.data > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/channels.conf > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/remote.conf > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/setup.conf > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/timers.conf > /dev/null 2>&1 || true
+ rm -f /var/cache/vdr/commands.conf > /dev/null 2>&1 || true
+ rm -f /var/cache/vdr/reccmds.conf > /dev/null 2>&1 || true
+ rm -f /var/cache/vdr/epg.data > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/channels.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/remote.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/setup.conf > /dev/null 2>&1 || true
+ rm -f /var/lib/vdr/timers.conf > /dev/null 2>&1 || true
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;