[vdr] 01/12: systemd disabled by default, made note on how to enable it in README.Debian

[Tobias Grimm]

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 442d13fd5dadfdbb819da065e24f1fdd6df9b364
Author: etobi <git at e-tobi.net>
Date:   Thu Mar 26 22:16:21 2015 +0100

    systemd disabled by default, made note on how to enable it in README.Debian
---
 debian/README.Debian | 29 ++++++-----------------------
 debian/control       |  2 +-
 debian/rules         |  2 +-
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index e894024..e317b8c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,29 +1,12 @@
 vdr for Debian
 --------------
 
-Comments to the Debian version:
-
- - You need a DVB card and a driver using the "Linux DVB S2API".
-   These drivers have been merged into the Linux-Kernel in version 2.6.28,
-   but you might require a later kernel or special drivers for you DVB card.
-   You can get more information about the DVB driver development at:
-
-   http://www.linuxtv.org
-
-   Please also note, that proper trick speed playback with a full featured DVB
-   card needs an improved av7110 firmware. Without this firmware you might
-   experience problems like jumping backwards when stopping fast-forward
-   playback. The improved firmware is provided by Oliver Endriss and can be
-   download here:
- 
-   http://www.escape-edv.de/endriss/firmware/
-
- - all the small scripts and tools distributed with the package are located in
-   /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
- - cfg-dir was moved to /var/lib/vdr, to be FHS-compliant
+The vdr package comes with a SysVinit and a systemd service to run VDR as
+a backround service daemon. Both are disabled by default.
+
+Depending on your init system, you might want to enable VDR via
+`sudo systemctl enable vdr` for systemd or by setting ENABLED=1 in
+/etc/default/vdr for SysVinit.
 
 
 Additional configuration options
diff --git a/debian/control b/debian/control
index 388e8d9..a0af142 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>= 9), libjpeg-dev, libcap-dev, dh-systemd,
   libncursesw5-dev, libfreetype6-dev, libfontconfig-dev, gettext,
-  python, linux-libc-dev (>= 3.0), libfribidi-dev, libsystemd-daemon-dev
+  python, linux-libc-dev (>= 3.0), libfribidi-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://git.debian.org/pkg-vdr-dvb/vdr.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr.git
diff --git a/debian/rules b/debian/rules
index a4198c5..34680fc 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 systemd
+	dh $@
 
 override_dh_auto_build:
 	dh_auto_build -- $(MAKE_OPTIONS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git