[vdr] 04/04: 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 c37cdff65d11830db9d7ae9c62ea2842bc8bca46
Merge: bb2350d 17ef883
Author: Tobias Grimm <etobi at debian.org>
Date:   Sat Sep 26 22:51:58 2015 +0200

    Merge branch 'master' into e-tobi

 debian/changelog                       |  6 ++++++
 debian/rules                           |  4 ++++
 debian/vdr-plugin-dvbhddevice.postinst | 11 -----------
 debian/vdr-plugin-dvbsddevice.postinst | 11 -----------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index 2bdf881,681cb17..dd523b5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,17 +1,31 @@@
 -vdr (2.2.0-2) unstable; urgency=medium
++vdr (2.2.0-3~etobi5) unstable; urgency=medium
+ 
+   * Use debhelper addon for dvb(sd|hd)device plugins
+ 
 - -- Tobias Grimm <etobi at debian.org>  Wed, 23 Sep 2015 22:17:04 +0200
++ -- Tobias Grimm <etobi at debian.org>  Sat, 26 Sep 2015 22:51:50 +0200
+ 
 -vdr (2.2.0-1) unstable; urgency=medium
 +vdr (2.2.0-2~etobi4) unstable; urgency=medium
 +
 +  * Dropped the autmatic migration of the old config files
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 20 Sep 2015 22:41:48 +0200
 +
 +vdr (2.2.0-2~etobi3) unstable; urgency=medium
 +
 +  * Fixed a bug in plugin preinst, if it is called before VDR is installed
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 06 Sep 2015 16:47:01 +0200
 +
 +vdr (2.2.0-2~etobi2) unstable; urgency=medium
 +
 +  * Added systemd support
 +  * Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now
 +    enabled by default and might be disabled manuall via update-rc.d / systemctl
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 30 Aug 2015 18:09:04 +0200
 +
 +vdr (2.2.0-2~etobi1) 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
 -  * When LIRC is set to an empty string, disable LIRC. By default use
 -    /var/run/lirc/lircd
    * Updated copyright
    * Arguments for vdr are now read from /etc/vdr/conf.d/
    * Plugins must provide a config, which may cointain plugin arguments, in

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