[vdr] 07/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 branch e-tobi
in repository vdr.

commit 3218989340590fb51964a261ddc31987d182f24a
Merge: 2155b4d c9c2f2d
Author: etobi <git at e-tobi.net>
Date:   Sat Aug 8 12:22:52 2015 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/vdr.default

 debian/.vdr-patches                    |  8 ++++----
 debian/R90.custom                      |  8 ++++++++
 debian/README.Debian                   | 32 ++++----------------------------
 debian/TODO.Debian                     |  2 --
 debian/{ => bash-completion}/svdrpsend |  0
 debian/changelog                       |  8 ++++++++
 debian/control                         |  2 +-
 debian/patches/04_newplugin.patch      |  2 +-
 debian/rules                           |  7 +++++--
 debian/vdr.config                      |  2 +-
 debian/vdr.default                     |  3 ---
 debian/vdr.init                        | 26 ++++++++++----------------
 debian/vdr.install                     |  1 -
 debian/vdr.postrm                      |  3 ---
 debian/vdr.service                     | 11 +++++++++++
 15 files changed, 53 insertions(+), 62 deletions(-)

diff --cc debian/.vdr-patches
index 9b4e778,924e974..7a16ff0
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,10 -1,4 +1,10 @@@
- 04_newplugin.patch:22a72799db5051ed0ef08b0770a5e6f0
- 06_default_svdrp_port_0.patch:008562fda187f9e88bb9dd10ac6c59f6
- 12_osdbase-maxitems.patch:0a9ce49053c44b51eae36db595870122
- 99_ncursesw-include.patch:5d5d3ced7f7647f1680f0481ad2650fe
 -04_newplugin.patch:be5169037184e60fe7265891bb8f9f94
++04_newplugin.patch:bd963b34c9b1b473f445535d83c30ec1
+ 06_default_svdrp_port_0.patch:98fc8d7a9f450374de5e5690ad4c98c7
+ 12_osdbase-maxitems.patch:c5bf663d8e89d441eb9c040403e19228
+ 99_ncursesw-include.patch:98a6f4705b312dc9de9775e867e95d54
 +opt-27_ttxtsubs.patch:a1aeece65cc723e38b65fbfb8d10edf3
 +opt-37-x_menuorg.patch:5af45321309b1e723d89e5c6dc1c947f
 +opt-41-x_timer-info.patch:571ca43774dbd768cd9d90552fd1442d
 +opt-42-x_MainMenuHooks.patch:7ccacd9d4d79efbb2b9341c3d8e366a9
 +opt-45_yaepg.patch:f867903d4be9339198bdb22e823b679e
 +opt-50_graphtft.patch:7de63c9d4e2a8de754297ae40b367e01
diff --cc debian/changelog
index 64ddd20,2642c18..802d2ec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,11 +1,13 @@@
 -vdr (2.2.0-1) UNRELEASED; urgency=medium
++vdr (2.2.0-2~etobi2) unstable; urgency=medium
++
++  * Added systemd support
++  * Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now
++    enabled by default and might be disabled manuall via update-rc.d / systemctl
++
++ -- Tobias Grimm <etobi at debian.org>  Sat, 08 Aug 2015 12:25:52 +0200
++
 +vdr (2.2.0-2~etobi1) unstable; urgency=medium
  
 -  * New upstream release
 -  * Dropped upgrade code for pre-Squeeze releases
 -  * Default video directory is now /var/lib/video because multiple video
 -    directories are not supported anymore
 -  * When LIRC is set to an empty string, disable LIRC. By default use
 -    /var/run/lirc/lircd
    * Updated copyright
    * Arguments for vdr are now read from /etc/vdr/conf.d/
    * Plugins must provide a config, which may cointain plugin arguments, in

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