[vdr] 01/08: Added new LIRC option to /etc/default/vdr to allow to change the lirc path or to disable lirc by setting it to /dev/null

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr.

commit 5ba34b6b0ffa918256f06724d57ffbf4e3431fe5
Author: etobi <git at e-tobi.net>
Date:   Sun May 19 11:59:45 2013 +0200

    Added new LIRC option to /etc/default/vdr to allow to change the lirc path or to disable lirc by setting it to /dev/null
---
 debian/README.Debian |    8 ++++++++
 debian/changelog     |    7 +++++++
 debian/vdr.init      |    8 +++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index e40780b..17eadf3 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -88,6 +88,14 @@ USER=<USERNAME>
     Username under which vdr will run. All plugins and commands invoked by VDR
     will be executed with the rights of this user.
 
+LIRC=<lirc_device>
+
+    Default: /dev/lircd
+
+    Allows one to change the LIRC device or disable LIRC alltogether by
+    setting it to /dev/null which might be required if you use a
+    different frontend, like XBMC or xineliboutput.
+
 VDR_CHARSET_OVERRIDE=<CHARSET>
 
     Default: not set
diff --git a/debian/changelog b/debian/changelog
index 417af5e..6571e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr (2.0.1-2) unstable; urgency=low
+
+  * Added new LIRC option to /etc/default/vdr to allow to change the lirc path
+    or to disable lirc by setting it to /dev/null (Closes: #708683)
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 19 May 2013 11:57:39 +0200
+
 vdr (2.0.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #707413)
diff --git a/debian/vdr.init b/debian/vdr.init
index da5d265..c5ebbdc 100644
--- a/debian/vdr.init
+++ b/debian/vdr.init
@@ -83,6 +83,12 @@ startvdr()
                 OPTIONS="--vfat $OPTIONS"
             fi
 
+            if [ -n "$LIRC" ]; then
+                LIRC_OPT="--lirc=$LIRC"
+            else
+                LIRC_OPT="--lirc"
+            fi
+
             if [ "$ENABLE_CORE_DUMPS" == "1" ]; then
                 ulimit -c unlimited
                 OPTIONS="$OPTIONS --userdump"
@@ -92,7 +98,7 @@ startvdr()
                 --name $(basename $DAEMON) --pidfile $PIDFILE --make-pidfile -- \
                 -v $VIDEO_DIR -c $CFG_DIR -L $PLUGIN_DIR -r $REC_CMD \
                 -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g /tmp \
-                --port $SVDRP_PORT $OPTIONS $PLUGINS $REDIRECT
+                --port $SVDRP_PORT $OPTIONS $LIRC_OPT $PLUGINS $REDIRECT
         else
             echo -n " - seems to be running already"
         fi

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