r738 - vdr/vdr/trunk/debian
Tobias Grimm
pkg-vdr-dvb-changes@lists.alioth.debian.org
Tue, 28 Jun 2005 18:24:19 +0000
Author: tiber-guest
Date: 2005-06-28 18:24:18 +0000 (Tue, 28 Jun 2005)
New Revision: 738
Modified:
vdr/vdr/trunk/debian/R90.custom
vdr/vdr/trunk/debian/README.Debian
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/commands-loader.sh
vdr/vdr/trunk/debian/copyright
vdr/vdr/trunk/debian/patchlevel.sh
vdr/vdr/trunk/debian/runvdr
vdr/vdr/trunk/debian/vdr-dev.install
vdr/vdr/trunk/debian/vdr-recordingaction
vdr/vdr/trunk/debian/vdr-shutdown
vdr/vdr/trunk/debian/vdr.config
vdr/vdr/trunk/debian/vdr.prerm
Log:
replaced some tabs with spaces
Modified: vdr/vdr/trunk/debian/R90.custom
===================================================================
--- vdr/vdr/trunk/debian/R90.custom 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/R90.custom 2005-06-28 18:24:18 UTC (rev 738)
@@ -29,15 +29,15 @@
case $1 in
before)
- # do here what ever you would like to do right BEFORE
- # the recording $2 STARTS
- ;;
+ # do here what ever you would like to do right BEFORE
+ # the recording $2 STARTS
+ ;;
after)
- # do here what ever you would like to do right AFTER
- # the recording $2 ENDED
+ # do here what ever you would like to do right AFTER
+ # the recording $2 ENDED
;;
edited)
- # do here what ever you would like to do right AFTER
- # the recording $2 has been EDITED
+ # do here what ever you would like to do right AFTER
+ # the recording $2 has been EDITED
;;
esac
Modified: vdr/vdr/trunk/debian/README.Debian
===================================================================
--- vdr/vdr/trunk/debian/README.Debian 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/README.Debian 2005-06-28 18:24:18 UTC (rev 738)
@@ -12,7 +12,7 @@
/usr/lib/vdr/. You may use and modify them for you own purposes.
- if you want to use the vdr-initscript, edit /etc/default/vdr and change
ENABLED=0 to ENABLED=1, and the other Options in this file
- - video-dir is moved to /var/lib/video see #234429
+ - video-dir is moved to /var/lib/video see #234429
- cfg-dir was moved to /var/lib/vdr, to be FHS-compliant
- The selection of your favourite vdr-binary (vdr-daemon, vdr-kbd, vdr-lirc or
vdr-rcu) is now handeled via update-alternatives, so if you have more than
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/changelog 2005-06-28 18:24:18 UTC (rev 738)
@@ -12,6 +12,8 @@
- Added installation of README.vps and README.developer
- Fixed parameter passing in vdr-shutdown
- Fixed package description
+ - Replaced some tabs with spaces and fixed indentation
+ - Took over commands-loader.sh from vdrdevel
-- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sun, 19 Jun 2005 17:25:56 +0200
@@ -354,7 +356,7 @@
* Improved debconf question texts.
* Fixed vdr.postinst script so that channels.conf is no longer overwritten.
(Closes: #233646)
- * Fixed bug in vdr.postinst script which prevented package upgrade.
+ * Fixed bug in vdr.postinst script which prevented package upgrade.
* Adapted debian/rules to use upstream make plugin/plugin-clean targets. (Closes: #233630)
-- Andreas Mueller <amu@tr.debian.net> Wed, 18 Feb 2004 17:08:34 +0100
Modified: vdr/vdr/trunk/debian/commands-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/commands-loader.sh 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/commands-loader.sh 2005-06-28 18:24:18 UTC (rev 738)
@@ -7,8 +7,8 @@
echo -e \
"#\n"\
"# This file is automatically generated by the vdr init-script. You can\n"\
-"# define custom commands in /etc/vdr/command-hooks/$1.custom conf.\n"\
-"# (see /usr/share/doc/vdr/README.Debian.gz)\n"\
+"# define custom commands in /etc/vdr/command-hooks/$1.custom.conf\n"\
+"# (see /usr/share/doc/vdr/README.Debian.gz).\n"\
"#\n\n\n"
}
@@ -23,7 +23,7 @@
local cmdtype
local cmdfile
local ordered_cmds
-
+
cmdtype=$1
cmdfile="/var/cache/vdr/$cmdtype.conf"
@@ -31,20 +31,20 @@
cmdsorder=( `cat /etc/vdr/command-hooks/order.$cmdtype.conf | sed "s/#.*$//"` )
cmds=( `find $CMDHOOKSDIR -maxdepth 1 -name "$cmdtype.*.conf" -printf "%f \n" | sed "s/$cmdtype\.\(.\+\)\.conf/\1/g"` )
-
+
# first the ordered commands:
for cmd in ${cmdsorder[@]}; do
for (( line=0 ; line<${#cmds[@]} ; line++ )); do
- if [ "$cmd" == "-${cmds[$line]}" ]; then
- unset cmds[$line]
- cmds=( "${cmds[@]}" )
- break
- fi
- if [ "$cmd" == "${cmds[$line]}" ]; then
+ if [ "$cmd" == "-${cmds[$line]}" ]; then
+ unset cmds[$line]
+ cmds=( "${cmds[@]}" )
+ break
+ fi
+ if [ "$cmd" == "${cmds[$line]}" ]; then
ordered_cmds=( "${ordered_cmds[@]}" "${cmds[$line]}" )
unset cmds[$line]
- cmds=( "${cmds[@]}" )
- break
+ cmds=( "${cmds[@]}" )
+ break
fi
done
done
@@ -53,9 +53,9 @@
# concatenate all commands
for cmd in ${ordered_cmds[@]}; do
- if [ "$cmd" != "" ]; then
- cat "$CMDHOOKSDIR/$cmdtype.$cmd.conf" >> "$cmdfile"
- echo "" >> "$cmdfile"
- fi
- done
+ if [ "$cmd" != "" ]; then
+ cat "$CMDHOOKSDIR/$cmdtype.$cmd.conf" >> "$cmdfile" || true
+ echo "" >> "$cmdfile"
+ fi
+ done
}
Modified: vdr/vdr/trunk/debian/copyright
===================================================================
--- vdr/vdr/trunk/debian/copyright 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/copyright 2005-06-28 18:24:18 UTC (rev 738)
@@ -15,11 +15,11 @@
Theme Authors:
Blue LCARS - (debian/themes/sttng-blue.theme) from Sascha Volkenandt
<sascha@akv-soft.de> was downloaded from
- http://www.magoa.net/sttng-blue.theme
+ http://www.magoa.net/sttng-blue.theme
Cool - (debian/themes/sttng-cool.theme) from
clocker@vdrportal.de, downloaded from
- http://vdrportal.de/board/thread.php?postid=260715#post260715
+ http://vdrportal.de/board/thread.php?postid=260715#post260715
Copyright:
Modified: vdr/vdr/trunk/debian/patchlevel.sh
===================================================================
--- vdr/vdr/trunk/debian/patchlevel.sh 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/patchlevel.sh 2005-06-28 18:24:18 UTC (rev 738)
@@ -25,7 +25,7 @@
PATCHES=$(cat /usr/include/vdr/patchlevel)
fi
# write *.substvars only if patchlevel not empty
- if [ "$PATCHES" != "patchlevel=" ]; then
+ if [ "$PATCHES" != "patchlevel=" ]; then
# scan control for packages
for p in $(dh_listpackages); do
echo "$PATCHES" >> debian/$p.substvars
Modified: vdr/vdr/trunk/debian/runvdr
===================================================================
--- vdr/vdr/trunk/debian/runvdr 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/runvdr 2005-06-28 18:24:18 UTC (rev 738)
@@ -6,53 +6,53 @@
OPTIONS="$*"
if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
- VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+ VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
else
- VDRCMD="/usr/bin/vdr $OPTIONS"
+ VDRCMD="/usr/bin/vdr $OPTIONS"
fi
function get_modulenames ()
{
- KVERS=`uname -r | grep -e '2.6'`
- if [ -z "$KVERS" ]; then
- MODULES=`lsmod | grep dvb-core | cut -d'[' -f2 | cut -d']' -f1`
- else
- MODULES=`lsmod | grep ^dvb_core | awk '{print $4;}' | awk '{ gsub(/,/," ", $1); print }'`
- fi
+ KVERS=`uname -r | grep -e '2.6'`
+ if [ -z "$KVERS" ]; then
+ MODULES=`lsmod | grep dvb-core | cut -d'[' -f2 | cut -d']' -f1`
+ else
+ MODULES=`lsmod | grep ^dvb_core | awk '{print $4;}' | awk '{ gsub(/,/," ", $1); print }'`
+ fi
}
function set_permissions ()
{
- for FILE in av7110_ir budget_ci_ir; do
- if [ -e "/proc/$FILE" ]; then
- chown $USER.$GROUP /proc/$FILE
- fi
- done
+ for FILE in av7110_ir budget_ci_ir; do
+ if [ -e "/proc/$FILE" ]; then
+ chown $USER.$GROUP /proc/$FILE
+ fi
+ done
}
get_modulenames
-if [ -z "$MODULES" ]; then # If no DVB-Modules were found, try to load
- modprobe dvb > /dev/null 2>&1 # the module with the name dvb, this could
- get_modulenames # be an alias for the dvb-ttpci-module or
-fi # another dvb-module
+if [ -z "$MODULES" ]; then # If no DVB-Modules were found, try to load
+ modprobe dvb > /dev/null 2>&1 # the module with the name dvb, this could
+ get_modulenames # be an alias for the dvb-ttpci-module or
+fi # another dvb-module
MODULES="$MODULES dvb-core"
while (true) do
- set_permissions
- eval $VDRCMD >/dev/null 2>&1
- if test $? -eq 0; then exit; fi
- logger "restarting VDR"
- /usr/bin/killall -q -TERM /usr/bin/vdr
- sleep 10
-
- for MODULE in $MODULES; do
- rmmod $MODULE >/dev/null 2>&1
- wait `pidof rmmod`
- done
-
- for MODULE in $MODULES; do
- modprobe $MODULE >/dev/null 2>&1
- done
+ set_permissions
+ eval $VDRCMD >/dev/null 2>&1
+ if test $? -eq 0; then exit; fi
+ logger "restarting VDR"
+ /usr/bin/killall -q -TERM /usr/bin/vdr
+ sleep 10
+
+ for MODULE in $MODULES; do
+ rmmod $MODULE >/dev/null 2>&1
+ wait `pidof rmmod`
+ done
+
+ for MODULE in $MODULES; do
+ modprobe $MODULE >/dev/null 2>&1
+ done
done
Modified: vdr/vdr/trunk/debian/vdr-dev.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-dev.install 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/vdr-dev.install 2005-06-28 18:24:18 UTC (rev 738)
@@ -1,12 +1,12 @@
-*.h usr/include/vdr/
+*.h usr/include/vdr/
-libsi/*.h usr/include/vdr/libsi/
+libsi/*.h usr/include/vdr/libsi/
-debian/debianize-vdrplugin usr/bin/
-debian/plugin-template/ usr/share/vdr-dev/
+debian/debianize-vdrplugin usr/bin/
+debian/plugin-template/ usr/share/vdr-dev/
-vdr-newplugin usr/bin/
+vdr-newplugin usr/bin/
-debian/lintian/vdr-dev usr/share/lintian/overrides/
+debian/lintian/vdr-dev usr/share/lintian/overrides/
debian/patchlevel.sh usr/lib/vdr-dev/
Modified: vdr/vdr/trunk/debian/vdr-recordingaction
===================================================================
--- vdr/vdr/trunk/debian/vdr-recordingaction 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/vdr-recordingaction 2005-06-28 18:24:18 UTC (rev 738)
@@ -31,19 +31,19 @@
for recordinghook in $recordinghooks; do
case $1 in
- before|after)
- action="$1 recording $2"
- ;;
- edited)
- action="after editing recording $2"
- ;;
+ before|after)
+ action="$1 recording $2"
+ ;;
+ edited)
+ action="after editing recording $2"
+ ;;
esac
if [ -x $recordinghook ]; then
- logger -t recordingaction "executing $recordinghook $action"
- $recordinghook $*
+ logger -t recordingaction "executing $recordinghook $action"
+ $recordinghook $*
else
- logger -t recordingaction "executing $recordinghook $action as shell script"
- /bin/sh $recordinghook $*
+ logger -t recordingaction "executing $recordinghook $action as shell script"
+ /bin/sh $recordinghook $*
fi
[ $? -ne 0 ] && logger -t recordingaction "error when executing $recordinghook"
done
Modified: vdr/vdr/trunk/debian/vdr-shutdown
===================================================================
--- vdr/vdr/trunk/debian/vdr-shutdown 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/vdr-shutdown 2005-06-28 18:24:18 UTC (rev 738)
@@ -27,24 +27,24 @@
TRY_AGAIN=0
if [ -x $shutdownhook ]; then
- $log "executing $shutdownhook"
- result_data=`$shutdownhook $@`
+ $log "executing $shutdownhook"
+ result_data=`$shutdownhook "$@"`
else
- $log "executing $shutdownhook as shell script"
- result_data=`/bin/sh $shutdownhook $@`
+ $log "executing $shutdownhook as shell script"
+ result_data=`/bin/sh $shutdownhook "$@"`
fi
result=$?
eval $result_data
if [ $result -ne 0 ] ; then
- $log "Shutdown aborted by $shutdownhook with exitcode $result"
- osdmsg "Shutdown abgebrochen / Shutdown aborted!" &
- [ -z "$ABORT_MESSAGE" ] || osdmsg "$ABORT_MESSAGE" &
- exit $result
+ $log "Shutdown aborted by $shutdownhook with exitcode $result"
+ osdmsg "Shutdown abgebrochen / Shutdown aborted!" &
+ [ -z "$ABORT_MESSAGE" ] || osdmsg "$ABORT_MESSAGE" &
+ exit $result
fi
if [ $TRY_AGAIN -gt 0 ]
then
- $log "$shutdownhook requests to try again in $TRY_AGAIN minutes"
+ $log "$shutdownhook requests to try again in $TRY_AGAIN minutes"
echo "$svdrpsend HITK Power" | at now + $TRY_AGAIN minutes
osdmsg "Shutdown aborted. Retry in $TRY_AGAIN minutes." &
exit 0
Modified: vdr/vdr/trunk/debian/vdr.config
===================================================================
--- vdr/vdr/trunk/debian/vdr.config 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/vdr.config 2005-06-28 18:24:18 UTC (rev 738)
@@ -13,8 +13,8 @@
# ask about creating /var/lib/video
if [ ! -e /var/lib/video ]; then
- db_input high vdr/create_video_dir || true
- db_go
+ db_input high vdr/create_video_dir || true
+ db_go
fi
# ask about dvb card type
Modified: vdr/vdr/trunk/debian/vdr.prerm
===================================================================
--- vdr/vdr/trunk/debian/vdr.prerm 2005-06-28 17:08:32 UTC (rev 737)
+++ vdr/vdr/trunk/debian/vdr.prerm 2005-06-28 18:24:18 UTC (rev 738)
@@ -7,11 +7,11 @@
case "$1" in
remove)
- update-alternatives --remove vdr /usr/bin/vdr-daemon
- update-alternatives --remove vdr /usr/bin/vdr-kbd
- update-alternatives --remove vdr /usr/bin/vdr-lirc
- update-alternatives --remove vdr /usr/bin/vdr-rcu
- ;;
+ update-alternatives --remove vdr /usr/bin/vdr-daemon
+ update-alternatives --remove vdr /usr/bin/vdr-kbd
+ update-alternatives --remove vdr /usr/bin/vdr-lirc
+ update-alternatives --remove vdr /usr/bin/vdr-rcu
+ ;;
esac
#DEBHELPER#