[vdr] 01/01: 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 39e4f6b354529adccbe1e287f56c2c46a6aa0b68
Merge: 2fd82c9 f680601
Author: etobi <git at e-tobi.net>
Date:   Sun Sep 8 21:32:40 2013 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/changelog
    	debian/vdr.init
    	debian/vdr.install
    	debian/vdr.postinst

 CONTRIBUTORS                          |   20 +++++++++++++-
 HISTORY                               |   39 ++++++++++++++++++++++++++-
 PLUGINS/src/dvbhddevice/HISTORY       |    5 ++++
 PLUGINS/src/dvbhddevice/dvbhddevice.c |    2 +-
 PLUGINS/src/dvbhddevice/menu.c        |    7 ++++-
 PLUGINS/src/dvbhddevice/po/de_DE.po   |    5 +++-
 PLUGINS/src/dvbhddevice/po/fi_FI.po   |    5 +++-
 PLUGINS/src/dvbhddevice/po/it_IT.po   |    5 +++-
 PLUGINS/src/dvbsddevice/HISTORY       |    5 ++++
 PLUGINS/src/dvbsddevice/dvbsddevice.c |    6 ++---
 config.h                              |    6 ++---
 cutter.c                              |    8 +++---
 debian/changelog                      |   12 ++++++++-
 debian/control                        |    4 +++
 debian/rules                          |    1 +
 debian/vdr.examples                   |    1 -
 debian/vdr.init                       |    2 +-
 debian/vdr.install                    |    3 +++
 debian/vdr.links                      |    2 ++
 device.c                              |    5 ++--
 device.h                              |    4 +--
 diseqc.c                              |    4 +--
 dvbdevice.c                           |    4 +--
 epg.c                                 |   19 +++++++------
 lirc.c                                |    3 ++-
 menu.c                                |   14 +++++-----
 newplugin                             |    6 ++---
 osd.c                                 |   10 +++----
 recording.c                           |   48 ++++++++++++++++++---------------
 skinlcars.c                           |    4 ++-
 transfer.c                            |    4 +--
 31 files changed, 186 insertions(+), 77 deletions(-)

diff --cc debian/changelog
index 849e81b,3fe11cf..85049d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,29 +1,42 @@@
- vdr (2.0.1-1~etobi2) UNRELEASED; urgency=low
 -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)
++  * vdr-plugin-dvbhddevice and vdr-plugin-examples Replaces/Breaks
++    vdr << 2.0.1-1 - manpages have been moved from vdr into the plugin
++    packages  (Closes: #709152)
++
++ -- Tobias Grimm <etobi at debian.org>  Sun, 08 Sep 2013 21:32:26 +0200
++
++vdr (2.0.1-1~etobi2) unstable; urgency=low
 +
 +  * Fixed and improved opt-22-x_edit_marks.patch
  
 - -- Tobias Grimm <etobi at debian.org>  Wed, 04 Sep 2013 13:53:51 +0200
 + -- Thomas Günther <tom at toms-cafe.de>  Sun, 21 Apr 2013 17:45:43 +0200
  
 -vdr (2.0.2-1) unstable; urgency=low
 +vdr (2.0.1-1~etobi1) unstable; urgency=low
  
    * New upstream release
 -  * vdr-plugin-dvbhddevice and vdr-plugin-examples Replaces/Breaks
 -    vdr << 2.0.1-1 - manpages have been moved from vdr into the plugin
 -    packages  (Closes: #709152)
 +  * Simplified the commands loader and dropped the ordering via
 +    order.reccmds.conf / order.commands.conf
 +  * Fixed collection of patch info to work with quilt patches
  
 - -- Tobias Grimm <etobi at debian.org>  Sat, 25 May 2013 09:12:01 +0200
 + -- Tobias Grimm <etobi at debian.org>  Sat, 13 Apr 2013 23:28:38 +0200
  
 -vdr (2.0.1-2) unstable; urgency=low
 +vdr (2.0.0-1~etobi4) unstable; urgency=low
  
 -  * Added new LIRC option to /etc/default/vdr to allow to change the lirc path
 -    or to disable lirc by setting it to /dev/null (Closes: #708683)
 +  * Added upstream fix vdr-2.0.0-fixkeeptracksinit.diff
  
 - -- Tobias Grimm <etobi at debian.org>  Sun, 19 May 2013 11:57:39 +0200
 + -- Tobias Grimm <etobi at debian.org>  Sat, 06 Apr 2013 10:36:35 +0200
  
 -vdr (2.0.1-1) unstable; urgency=low
 +vdr (2.0.0-1~etobi3) unstable; urgency=low
 +
 +  * Added opt-22-x_edit_marks.patch again
 +
 + -- Tobias Grimm <etobi at debian.org>  Tue, 02 Apr 2013 21:33:01 +0200
 +
 +vdr (2.0.0-1~etobi2) unstable; urgency=low
  
 -  * New upstream release (Closes: #707413)
    * Added new config option ENABLE_CORE_DUMPS in /etc/default/vdr
    * Append CPPFLAGS to CFLAGS, so this gets stored in vdr.pc
      and can be used by plugins
diff --cc debian/vdr.install
index 3ca3146,1863244..93d1ddf
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@@ -32,4 -32,5 +32,7 @@@ debian/commands.update-recordings.con
  
  debian/themes/*.theme                   var/lib/vdr/themes/
  
+ var/lib/vdr/channels.conf.sat           usr/share/vdr/channels.conf-examples/
+ channels.conf.*                         usr/share/vdr/channels.conf-examples/
++
 +debian/vdraptrefresh                    usr/sbin/

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