[vdr] 01/03: When LIRC is set to an empty string, disable LIRC. By default use /var/run/lirc/lircd

[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 2211865d60ac991f7613fb45c00742879670ccfb
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 1 19:30:52 2015 +0100

    When LIRC is set to an empty string, disable LIRC. By default use /var/run/lirc/lircd
---
 debian/README.Debian    | 4 ++--
 debian/TODO.Debian      | 1 -
 debian/changelog        | 2 ++
 debian/config-loader.sh | 3 +++
 debian/vdr.init         | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 2cb7906..cde5897 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -90,10 +90,10 @@ USER=<USERNAME>
 
 LIRC=<lirc_device>
 
-    Default: /dev/lircd
+    Default: /var/run/lirc/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
+    setting it to "" which might be required if you use a
     different frontend, like XBMC or xineliboutput.
 
 VDR_CHARSET_OVERRIDE=<CHARSET>
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 05fd72b..5d984ab 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,5 +1,4 @@
 TODO: When plugin could not be loaded, log stderr output somewhere
-TODO: Add option USE_LIRC=yes|no (see http://www.vdr-portal.de/board/thread.php?postid=829057#post829057)
 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
diff --git a/debian/changelog b/debian/changelog
index f84f5bd..a9c55b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ vdr (2.2.0-1) UNRELEASED; urgency=medium
   * Dropped upgrade code for pre-Squeeze releases
   * Default video directory is now /var/lib/video because multiple video
     directories are not supported anymore
+  * When LIRC is set to an empty string, disable LIRC. By default use
+    /var/run/lirc/lircd
 
  -- Tobias Grimm <etobi at debian.org>  Thu, 19 Feb 2015 12:18:30 +0100
 
diff --git a/debian/config-loader.sh b/debian/config-loader.sh
index 3d3b301..8b76b0f 100644
--- a/debian/config-loader.sh
+++ b/debian/config-loader.sh
@@ -77,4 +77,7 @@ ENV_FILE="none"
 # Enable VFAT file system support by default
 VFAT=1
 
+# Default LIRC device
+LIRC=/var/run/lirc/lircd
+
 test -f /etc/default/vdr && . /etc/default/vdr
diff --git a/debian/vdr.init b/debian/vdr.init
index e6647c9..242fa81 100644
--- a/debian/vdr.init
+++ b/debian/vdr.init
@@ -88,7 +88,7 @@ startvdr()
             if [ -n "$LIRC" ]; then
                 LIRC_OPT="--lirc=$LIRC"
             else
-                LIRC_OPT="--lirc"
+                LIRC_OPT=""
             fi
 
             if [ "$ENABLE_CORE_DUMPS" == "1" ]; then

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