[vdr] 08/12: 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.3.8-2_etobi1
in repository vdr.

commit 6bbd0781659406a999f51148e89c81592b94ada8
Merge: 489dfb9 15b2b77
Author: Tobias Grimm <etobi at debian.org>
Date:   Sat Feb 10 19:03:13 2018 +0100

    Merge branch 'master' into e-tobi

 debian/changelog                             |  6 ++++++
 debian/control                               |  4 ++--
 debian/debianize-vdrplugin                   | 29 ++++++++++++++++------------
 debian/patches/06_default_svdrp_port_0.patch | 16 ---------------
 debian/patches/series                        |  3 ++-
 debian/patches/skincurses-log-errors.patch   | 21 ++++++++++++++++++++
 debian/po/pt.po                              | 14 ++++++++------
 7 files changed, 56 insertions(+), 37 deletions(-)

diff --cc debian/changelog
index ac6c2cf,a5f999e..2ac954e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -vdr (2.3.8-2) UNRELEASED; urgency=medium
++vdr (2.3.8-2~etobi1) UNRELEASED; urgency=medium
+ 
+   * 
+ 
+  -- Tobias Grimm <etobi at debian.org>  Wed, 27 Dec 2017 22:33:24 +0100
+ 
 -vdr (2.3.8-1) unstable; urgency=medium
 +vdr (2.3.8-1~etobi1) unstable; urgency=medium
  
    [ Tobias Grimm ]
    * New upstream release (Closes: #853698)
diff --cc debian/patches/series
index 02122ea,7e66768..c7367eb
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,25 -2,5 +2,26 @@@
  12_osdbase-maxitems.patch
  
  99_ncursesw-include.patch
 -systemd.patch
 +
 +# Patch needed for the ttxtsubs plugin.
 +opt-27_ttxtsubs.patch
 +
 +# Speed up zapping channels.
 +# opt-29_syncearly.patch
 +
 +# Patch that shows if there is a valid setup value left or right with < and >.
 +# opt-35_setup-show-valid.patch
 +
 +# Patch needed for the menuorg plugin.
 +opt-37-x_menuorg.patch
 +
 +# Patch to allow plugins to replace the VDR mainmenus
 +opt-42-x_MainMenuHooks.patch
 +
 +# Patch needed for the yaepg plugin.
 +opt-45_yaepg.patch
 +
 +# Power down idle dvb devices
 +opt-60_power-saving.patch
++
+ skincurses-log-errors.patch

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