[vdr] 13/21: 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 fd38382b211167711b4345ba16e2b8b694e01579
Merge: 69043d1 eeee654
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 20:01:35 2015 +0100

    Merge branch 'master' into e-tobi

 debian/README.Debian | 71 +++++-----------------------------------------------
 debian/README.source |  7 ------
 debian/vdr.NEWS      | 10 ++++++++
 3 files changed, 16 insertions(+), 72 deletions(-)

diff --cc debian/vdr.NEWS
index f7ce700,9eb3af4..ef1772b
--- a/debian/vdr.NEWS
+++ b/debian/vdr.NEWS
@@@ -1,5 -1,15 +1,15 @@@
 -vdr (2.2.0-1) unstable; urgency=medium
 +vdr (2.2.0-1~etobi2) unstable; urgency=low
  
+   * Now using /etc/vdr/conf.d for loading plugins
+ 
+   VDR plugin packages now install a config file to /etc/vdr/conf.avail/.
+   This is basically the same as the old config file
+   /etc/vdr/plugins/plugin-<name>.conf and contains contains the command line
+   arguments passed to the plugin.
+   By creating a symlink in /etc/vdr.conf.d/ which points to the config in
+   conf.avail/ the plugin gets enabled for loading when the vdr daemon is
+   started.
+ 
    * Support for multiple video directories dropped
  
    The code for distributing recordings over several video directories has been

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