[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.40-1_etobi1-4-gb7a6434
etobi
git at e-tobi.net
Wed Mar 13 21:33:43 UTC 2013
The following commit has been merged in the e-tobi branch:
commit b7a6434198a5b555dc1915f380c83eee12cb5bee
Author: etobi <git at e-tobi.net>
Date: Wed Mar 13 22:25:20 2013 +0100
Removed the old ct'VDR command hooks
diff --git a/debian/commands.ctvdr.conf b/debian/commands.ctvdr.conf
deleted file mode 100644
index b6ba78b..0000000
--- a/debian/commands.ctvdr.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-VDR-Wartung {
- Informationen über das VDR-System : /usr/bin/ctvdrinfo
- Systeminformationen : /usr/bin/ctvdrsysinfo
- VDR neu starten? : nohup sh -c "( sleep 2 && /usr/lib/vdr/ctvdrwrapper --restart )" >/dev/null 2>&1 &
- VDR stoppen (ohne auszuschalten)? : nohup sh -c "( sleep 2 && /usr/lib/vdr/ctvdrwrapper --stop )" >/dev/null 2>&1 &
-}
diff --git a/debian/commands.shutdownvdr.conf b/debian/commands.shutdownvdr.conf
deleted file mode 100644
index fce0f19..0000000
--- a/debian/commands.shutdownvdr.conf
+++ /dev/null
@@ -1 +0,0 @@
-System herunterfahren?:/usr/bin/poweroffvdr
diff --git a/debian/ctvdrinfo b/debian/ctvdrinfo
deleted file mode 100644
index 5993b32..0000000
--- a/debian/ctvdrinfo
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-
-export COLUMNS=512
-LOG=/tmp/vdrinfo.log
-
-. /usr/lib/vdr/config-loader.sh
-
-vdr_package_version=`dpkg -s vdr | grep "Version:" | sed "s/.*Version: \(.*\)/\1/"`
-api_version=`eval "vdr -V -L/usr/bin/vdr 2>/dev/null | sed 's/.*[(/]\(.*\)).*/\1/'"`
-kernelversion=`uname -r`
-
-# find installed plugins
-plugins=(`find ${PLUGIN_DIR} -maxdepth 1 \
- -name "${PLUGIN_PREFIX}*.so.${api_version}" | \
- xargs -r dpkg -S 2>&1 | \
- sed "s/^dpkg:/'':/" | \
- sed "s/:.*${PLUGIN_PREFIX}\([^\.]\+\)\.so\.${version}.*$/:\1/" | \
- sort`)
-packages=(`echo ${plugins[@]} | sed 's/:[^ ]*//g'`)
-plugins=( `echo ${plugins[@]} | sed 's/[^ ]*://g'`)
-
-# extract version numbers
-eval "versions=($(LANG=en;dpkg -s ${packages[@]} 2>&1 | awk -F ':' '\
- /^Package: / {p=$2} \
- /^Package.*is not installed/ {print "\"\""} \
- (/Version: / || /^$/) && p!="" {print $2;p=""}'))"
-
-# load plugin order
-if [ -r "$PLUGIN_CFG_DIR/order.conf" ]; then
- plugin_order=(`cat $PLUGIN_CFG_DIR/order.conf | sed "s/#.*$//"`)
-fi
-
-echo "**************************************" | tee $LOG
-echo "* c't VDR Übersicht *" | tee -a $LOG
-echo "**************************************" | tee -a $LOG
-echo | tee -a $LOG
-echo "VDR : $vdr_package_version" | tee -a $LOG
-echo "Kernel: $kernelversion" | tee -a $LOG
-echo "ABI :`dpkg -s vdr | awk -F'[:,]' '/vdr-abi/ {print $2}'`"
-echo | tee -a $LOG
-
-if [ -e /usr/share/doc/vdr/optional-patches.txt ] ; then
- echo "Patches:" | tee -a $LOG
- echo "--------------------------------------" | tee -a $LOG
- cat /usr/share/doc/vdr/optional-patches.txt | tee -a $LOG
- echo | tee -a $LOG
-fi
-
-echo "Plugins:" | tee -a $LOG
-echo "( N = Native Plugin )" | tee -a $LOG
-echo "( D = Debian Plugin )" | tee -a $LOG
-echo "( - = Deaktiviert )" | tee -a $LOG
-echo "--------------------------------------" | tee -a $LOG
-
-for (( i=0 ; i<${#plugins[@]} ; i++ )); do
- mark="D"
- package="${packages[$i]}"
- version="${versions[$i]}"
- plugin="${plugins[$i]}"
- if [ ! "$version" ]; then
- mark="N"
- version="n/a"
- else
- for p in ${plugin_order[@]} ; do
- if [ "${p}" = "-${plugin}" ]; then
- mark="-"
- break
- fi
- if [ "${p}" = "${plugin}" ]; then
- break
- fi
- done
- fi
- if [ ! "$package" -o "$package" = "''" ]; then
- package="no package"
- fi
- echo "${mark} ${plugin}" | tee -a $LOG
- echo " Package: $package" | tee -a $LOG
- echo " Version: ${version}" | tee -a $LOG
-done
-
-echo | tee -a $LOG
-echo "AddonPackages:" | tee -a $LOG
-echo "--------------------------------------" | tee -a $LOG
-
-dpkg -l "vdr-*" | \
- grep -v "vdr-\(plugin-\|dev\|dbg\|kbd\|lirc\|daemon\|rcu\)" | \
- awk '/ii/ {printf ("%s (%s)\n", $2, $3)}' | tee -a $LOG
-
-echo
-echo "......................................"
-echo "Eine Kopie dieser Ausgaben wurde"
-echo "erzeugt in: $LOG"
-echo "......................................"
diff --git a/debian/ctvdrsysinfo b/debian/ctvdrsysinfo
deleted file mode 100644
index b562b72..0000000
--- a/debian/ctvdrsysinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-echo "CPU:"
-top -bci -n 1 | awk '/Cpu\(s\):.*/ { print 100-$8 "% - User " $2 " - System " $4 ;}'
-echo
-echo "Memory:"
-top -bci -n 1 | awk '/Mem:.*/ { print $2/1024 " MB Ram - " $4/1024 " MB Belegt" ;}'
-echo
-echo "Swap:"
-top -bci -n 1 | awk '/Swap:.*/ { print $2/1024 " MB Swap - " $4/1024 " MB Belegt" ;}'
-echo
-echo "Disk Space:"
-df -hl | awk '/dev/ {printf("%s : %s von %s frei\n", $1, $4, $2) }'
-echo
-echo "Tasks:"
-top -bci -n 1 | awk '/Tasks:.*/ { print $2 " - Running " $4 " - Sleep " $6 " - Stopped " $8 ;}'
diff --git a/debian/ctvdrwrapper.c b/debian/ctvdrwrapper.c
deleted file mode 100644
index 53bc37f..0000000
--- a/debian/ctvdrwrapper.c
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Small wrapper arround some administrative functions which have to be
-// executed set-root-uid
-//
-
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-int main (int argc, char *argv[])
-{
- if (argc == 2)
- {
- if (strcmp(argv[1], "--stop") == 0)
- {
- char* parameters[] = {"vdr", "stop", (char*) 0};
- return execv("/etc/init.d/vdr", parameters);
- }
- else if (strcmp(argv[1], "--restart") == 0)
- {
- char* parameters[] = {"vdr", "restart", (char*) 0};
- return execv("/etc/init.d/vdr", parameters);
- }
- }
- return 1;
-}
diff --git a/debian/poweroffvdr b/debian/poweroffvdr
deleted file mode 100644
index 4169fe4..0000000
--- a/debian/poweroffvdr
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# poweroffvdr - Tobias Grimm <tg at e-tobi.net>
-# -----------
-#
-# This hits the virtual power key of VDR
-#
-
-at now <<EOF
- /usr/bin/svdrpsend HITK Power
-EOF
diff --git a/debian/rules b/debian/rules
index d31d3d8..d466a6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,12 +15,10 @@ MAKE_OPTIONS = PREFIX=$(PREFIX) VIDEODIR=$(VIDEODIR) LIBDIR=$(LIBDIR)
override_dh_auto_build:
dh_auto_build -- $(MAKE_OPTIONS)
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/vdr-shutdown.wrapper debian/vdr-shutdown-wrapper.c
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o debian/ctvdrwrapper debian/ctvdrwrapper.c
override_dh_auto_clean:
dh_auto_clean
rm -f debian/vdr-shutdown.wrapper
- rm -f debian/ctvdrwrapper
rm -f debian/patchinfo
override_dh_auto_install:
diff --git a/debian/vdr.install b/debian/vdr.install
index 930f0c7..987a39c 100644
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@ -35,10 +35,4 @@ debian/commands.update-recordings.conf usr/share/vdr/command-hooks/
debian/themes/*.theme var/lib/vdr/themes/
-debian/commands.ctvdr.conf usr/share/vdr/command-hooks/
-debian/commands.shutdownvdr.conf usr/share/vdr/command-hooks/
-debian/ctvdrwrapper usr/lib/vdr/
-debian/ctvdrinfo usr/bin/
-debian/ctvdrsysinfo usr/bin/
-debian/poweroffvdr usr/bin/
debian/vdraptrefresh usr/sbin/
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index 8dcb817..10edb1a 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -65,12 +65,6 @@ if [ "$ACTION" = "configure" ] ; then
chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
chmod a=,u+srwx,g+srx /usr/lib/vdr/vdr-shutdown.wrapper
fi
-
- # make /usr/lib/vdr/ctvdrwrapper setuid/setgid
- if [ -e /usr/lib/vdr/ctvdrwrapper ] ; then
- chown root:$GROUP /usr/lib/vdr/ctvdrwrapper && \
- chmod a=,u+srwx,g+srx /usr/lib/vdr/ctvdrwrapper
- fi
fi
#DEBHELPER#
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list