[vdr] 10/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 69043d1d2955d60e6405292ee47c738bda8a802b
Merge: 6b7973c 514646d
Author: etobi <git at e-tobi.net>
Date:   Mon Mar 23 19:05:31 2015 +0100

    Merge branch 'master' into e-tobi

 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --cc debian/changelog
index 6accfcb,80f70da..83b8021
--- a/debian/changelog
+++ b/debian/changelog
@@@ -9,46 -15,12 +9,47 @@@ vdr (2.2.0-2~etobi5) UNRELEASED; urgenc
    * Removed the VDR_CHARSET_OVERRIDE from /etc/default/vdr - replaced with the
     --chartab command line argument
    * Removed dvb-modules reloading code (Closes: #512362)
+   * Added bash completion for svdrpesend (taken from yaVDR / Lars Hanisch)
  
 - -- Tobias Grimm <etobi at debian.org>  Sat, 07 Mar 2015 13:02:02 +0100
 + -- Tobias Grimm <etobi at debian.org>  Sun, 22 Mar 2015 12:12:25 +0100
 +
 +vdr (2.2.0-1~etobi4) unstable; urgency=medium
 +
 +  * Install channels.conf.sat as default channels.conf file
 +  * Dropped the default video directory link
 +
 + -- Tobias Grimm <etobi at debian.org>  Thu, 12 Mar 2015 16:09:09 +0100
 +
 +vdr (2.2.0-1~etobi3) unstable; 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:33:54 +0100
 +
 +vdr (2.2.0-1~etobi2) unstable; 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
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 22 Feb 2015 11:42:27 +0100
  
 -vdr (2.0.6-2) unstable; urgency=medium
 +vdr (2.2.0-1~etobi1) unstable; urgency=medium
  
 +  * New upstream release
 +  * New ABI version 2.2.0
 +
 + -- Tobias Grimm <etobi at debian.org>  Thu, 19 Feb 2015 12:29:13 +0100
 +
 +vdr (2.1.10-1~etobi1) unstable; urgency=medium
 +
 +  * New upstream release
 + -- Tobias Grimm <etobi at debian.org>  Thu, 12 Feb 2015 18:51:55 +0100
 +
 +vdr (2.1.9-1~etobi1) unstable; urgency=medium
 +
 +  * New upstream release
    * Merged from Jessie-version 2.0.3-3: Fixed use of getent in postinst script
      for detecting existing vdr user and group (Closes: #770773)
    * Standards-Version: 3.9.6

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