[vdr] 06/09: 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 eaa6935b78133a44ca54a1390f9be502d86cdb7a
Merge: 39e4f6b b5bafb9
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 26 09:50:13 2014 +0100

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

 CONTRIBUTORS                            |  53 +++++++++++-
 HISTORY                                 |  84 ++++++++++++++++++++
 PLUGINS/src/dvbhddevice/dvbhdffdevice.c |   4 +-
 PLUGINS/src/dvbsddevice/dvbsdffdevice.c |   6 +-
 PLUGINS/src/osddemo/HISTORY             |   5 ++
 PLUGINS/src/osddemo/osddemo.c           |  10 ++-
 channels.c                              |  16 ++--
 ci.c                                    |   4 +-
 config.h                                |  10 +--
 debian/changelog                        |   9 +++
 debian/control                          |   2 +-
 debian/vdr-dbg.postinst                 |   7 ++
 debian/vdr-dbg.postrm                   |   7 ++
 debian/vdr-dbg.preinst                  |   7 ++
 debian/vdr.init                         |   2 +
 device.c                                |   5 +-
 dvbdevice.c                             |   2 +-
 eit.c                                   |   4 +-
 font.c                                  |  23 +++---
 font.h                                  |   4 +-
 lirc.c                                  |  19 +++--
 menu.c                                  |  32 +++++---
 menu.h                                  |   4 +-
 nit.c                                   |   8 +-
 nit.h                                   |   6 +-
 pat.c                                   | 133 ++++++++++++++++++-------------
 pat.h                                   |  20 +++--
 recorder.c                              |  12 +--
 recording.c                             |  83 +++++++++++++------
 recording.h                             |   8 +-
 remote.c                                |   4 +-
 remux.c                                 |  98 ++++++++++++++++++-----
 remux.h                                 |  13 ++-
 sdt.c                                   |  27 +++++--
 sdt.h                                   |   5 +-
 skinlcars.c                             |  14 +++-
 skins.h                                 |   4 +-
 sourceparams.c                          |   6 +-
 sources.c                               |  11 ++-
 sources.conf                            | 137 ++++++++++++++++----------------
 sources.h                               |   3 +-
 vdr.1                                   |   4 +-
 vdr.c                                   |  12 +--
 43 files changed, 648 insertions(+), 279 deletions(-)

diff --cc debian/changelog
index 85049d6,80ae640..278b123
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,18 +1,13 @@@
 -vdr (2.0.6-1) unstable; urgency=medium
++vdr (2.0.6-1~etobi1) unstable; urgency=low
+ 
+   * New upstream release
+   * Standards-Version: 3.9.5
+   * Source /lib/lsb/init-functions in init script
 -
 - -- Tobias Grimm <etobi at debian.org>  Sun, 19 Oct 2014 12:54:37 +0200
 -
 -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
+ 
 -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