[vdr] 02/03: Merge branch 'master' into e-tobi

[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 e88171e62eae782c81b612d323e4b506d98f08c1
Merge: 01bf738 2211865
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 1 19:33:19 2015 +0100

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/TODO.Debian

 debian/README.Debian    | 4 ++--
 debian/TODO.Debian      | 3 +--
 debian/changelog        | 7 +++++++
 debian/config-loader.sh | 3 +++
 debian/vdr.init         | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --cc debian/TODO.Debian
index 1d70ad3,5d984ab..b35c86b
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@@ -1,9 -1,4 +1,8 @@@
 +TODO: Make runvdr more equal to official Debian version
  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, debugvdr and vdrleaktest
+ 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
 +
 +PLUGIN_DIR, PLUGIN_CFG_DIR, PLUGIN_PREFIX, CMDHOOKSDIR und REC_CMD rausschmeissen
 +
 +order.recmds/commands.conf rausschmeissen.
diff --cc debian/changelog
index ec63ca0,a9c55b8..508b319
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,12 @@@
 -vdr (2.2.0-1) UNRELEASED; urgency=medium
++vdr (2.2.0-1~etobi3) UNRELEASED; urgency=medium
++
++  * When LIRC is set to an empty string, disable LIRC. By default use
++    /var/run/lirc/lircd
++
++ -- Tobias Grimm <etobi at debian.org>  Sun, 01 Mar 2015 19:32:51 +0100
++
 +vdr (2.2.0-1~etobi2) unstable; urgency=medium
  
 -  * New upstream release
    * Dropped upgrade code for pre-Squeeze releases
    * Default video directory is now /var/lib/video because multiple video
      directories are not supported anymore

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