[vdr] 01/03: Merge branch 'jessie'

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to annotated tag debian/2.0.6-2
in repository vdr.

commit bbe7d3932bd099a02f157c1708239f76bcafa1c7
Merge: 4f720ed 6a1b4a7
Author: etobi <git at e-tobi.net>
Date:   Mon Dec 8 22:40:46 2014 +0100

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog    | 14 ++++++++++++++
 debian/vdr.postinst |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index eeb13af,1c2e79e..687d1cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,26 @@@
++vdr (2.0.6-2) UNRELEASED; urgency=medium
++
++  * Merged from Jessie-version 2.0.3-3: Fixed use of getent in postinst script
++    for detecting existing vdr user and group (Closes: #770773)
++
++ -- Tobias Grimm <etobi at debian.org>  Mon, 08 Dec 2014 22:39:51 +0100
++
 +vdr (2.0.6-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * Standards-Version: 3.9.5
 +  * Source /lib/lsb/init-functions in init script
 +  * Replaced ttf-freefont by fonts-freefont-ttf (Closes: #738254)
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 26 Oct 2014 12:01:40 +0100
 +
+ vdr (2.0.3-3) testing; urgency=medium
+ 
+   * Fixed use of getent in postinst script for detecting existing vdr user and
+     group (Closes: #770773)
+ 
+  -- Tobias Grimm <etobi at debian.org>  Mon, 08 Dec 2014 00:20:19 +0100
+ 
  vdr (2.0.3-2) unstable; urgency=medium
  
    * Fix "unhandled symlink to directory conversion of vdr-dbg (Closes: #736297)

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