This is an automated email from the git hooks/post-receive script. tiber-guest pushed a commit to branch e-tobi in repository vdr.
commit 9309314739110acd43c59285bb529f6e0cf7f9fe Author: etobi <[email protected]> Date: Fri Aug 7 23:07:43 2015 +0200 Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now enabled by default and might be disabled manuall via update-rc.d / systemctl --- debian/TODO.Debian | 1 + debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 5 ++++- debian/vdr.default | 3 --- debian/vdr.init | 25 ++++++++++--------------- debian/vdr.postrm | 3 --- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/debian/TODO.Debian b/debian/TODO.Debian index 5d984ab..d180755 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -2,3 +2,4 @@ TODO: When plugin could not be loaded, log stderr output somewhere TODO: Get rid of bash in init script TODO: The runvdr module (re)loading stuff is weird - it was introduced to workaround driver bugs and can probably be removed TODO: Get rid of configuraable PLUGIN_DIR, PLUGIN_CFG_DIR, PLUGIN_PREFIX, CMDHOOKSDIR and REC_CMD +TODO: vdr-dbg doc-symlink kann wegfallen \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 91cc1d6..2642c18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ vdr (2.2.0-1) UNRELEASED; urgency=medium * Removed dvb-modules reloading code (Closes: #512362) * Added bash completion for svdrpesend (taken from yaVDR / Lars Hanisch) * Added systemd support + * Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now + enabled by default and might be disabled manuall via update-rc.d / systemctl -- Tobias Grimm <[email protected]> Sat, 07 Mar 2015 13:02:02 +0100 diff --git a/debian/control b/debian/control index dd98034..b083fee 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: video Priority: extra Maintainer: Debian VDR Team <[email protected]> Uploaders: Thomas Schmidt <[email protected]>, Tobias Grimm <[email protected]>, Thomas Günther <[email protected]> -Build-Depends: debhelper (>= 9), bash-completion, libjpeg-dev, libcap-dev, dh-systemd, +Build-Depends: debhelper (>= 9), bash-completion, dh-systemd, libjpeg-dev, libcap-dev, libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext, python, linux-libc-dev (>= 3.0), libfribidi-dev Standards-Version: 3.9.6 diff --git a/debian/rules b/debian/rules index b4f75a1..4f2fd38 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ LIBDIR = /usr/lib/vdr/plugins MAKE_OPTIONS = PREFIX=$(PREFIX) VIDEODIR=$(VIDEODIR) LIBDIR=$(LIBDIR) SDNOTIFY=1 %: - dh $@ --with bash-completion + dh $@ --with bash-completion,systemd override_dh_auto_build: dh_auto_build -- $(MAKE_OPTIONS) @@ -38,6 +38,9 @@ override_dh_install: install -D PLUGINS/src/$$example/README debian/vdr-plugin-examples/usr/share/doc/vdr-plugin-examples/README.$$example; \ done +override_dh_installinit: + dh_installinit --error-handler true + override_dh_strip: dh_strip -p vdr --dbg-package=vdr-dbg dh_strip -p vdr-plugin-dvbsddevice --dbg-package=vdr-plugin-dvbsddevice-dbg diff --git a/debian/vdr.default b/debian/vdr.default index ab7070a..f6480e0 100644 --- a/debian/vdr.default +++ b/debian/vdr.default @@ -2,6 +2,3 @@ # # See also /usr/share/doc/vdr/README.Debian.gz # - -# Change to 1 to enable vdr's init-script -ENABLED=0 diff --git a/debian/vdr.init b/debian/vdr.init index 93c9965..c80a327 100644 --- a/debian/vdr.init +++ b/debian/vdr.init @@ -10,7 +10,6 @@ # Default-Stop: 0 1 6 # Short-Description: Starts the Linux Video Disk Recorder (VDR) # Description: Starts the Linux Video Disk Recorder (VDR), -# if it is enabled in /etc/default/vdr. ### END INIT INFO . /lib/lsb/init-functions @@ -66,22 +65,18 @@ get_status() startvdr() { - if [ "$ENABLED" != "0" ] ; then - # only start vdr if there is no other instance running - if start-stop-daemon --start --startas $DAEMON --test \ - --name $(basename $DAEMON) --pidfile $PIDFILE >/dev/null - then - mergecommands "commands" - mergecommands "reccmds" - configure_console_input + # only start vdr if there is no other instance running + if start-stop-daemon --start --startas $DAEMON --test \ + --name $(basename $DAEMON) --pidfile $PIDFILE >/dev/null + then + mergecommands "commands" + mergecommands "reccmds" + configure_console_input - start-stop-daemon --start --quiet --startas $DAEMON --background -d /tmp \ - --name $(basename $DAEMON) --pidfile $PIDFILE --make-pidfile -- $REDIRECT - else - echo -n " - seems to be running already" - fi + start-stop-daemon --start --quiet --startas $DAEMON --background -d /tmp \ + --name $(basename $DAEMON) --pidfile $PIDFILE --make-pidfile -- $REDIRECT else - echo -n " - aborted (to enable the daemon, edit /etc/default/vdr)" + echo -n " - seems to be running already" fi } diff --git a/debian/vdr.postrm b/debian/vdr.postrm index 8b74bc1..a241bf5 100644 --- a/debian/vdr.postrm +++ b/debian/vdr.postrm @@ -1,7 +1,4 @@ #! /bin/sh -# postrm script for vdr-plugin-#PACKAGE# -# -# see: dh_installdeb(1) set -e -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git _______________________________________________ pkg-vdr-dvb-changes mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-vdr-dvb-changes
