[vdr] 02/02: 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 annotated tag debian/2.0.6-1_etobi1
in repository vdr.

commit 22e90f0322c41e63cd303b1fbd9469fb971b835b
Merge: 7b36fa6 4f720ed
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 26 12:05:51 2014 +0100

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/changelog

 debian/changelog | 3 ++-
 debian/control   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 278b123,eeb13af..958146a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,11 -3,17 +3,12 @@@ vdr (2.0.6-1~etobi1) unstable; urgency=
    * 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-2) unstable; urgency=medium
 -
    * Fix "unhandled symlink to directory conversion of vdr-dbg (Closes: #736297)
  
-- -- Tobias Grimm <etobi at debian.org>  Mon, 31 Mar 2014 22:57:52 +0200
++ -- Tobias Grimm <etobi at debian.org>  Sun, 26 Oct 2014 12:02:58 +0100
  
 -vdr (2.0.3-1) unstable; urgency=low
 +vdr (2.0.3-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Install sample channels.conf's to /usr/share/vdr/examples/ (Closes: #709749)

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