[vdr] 11/16: Merge branch 'devel-2.3.x' into e-tobi
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Dec 27 13:02:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to annotated tag debian/2.3.2-1_etobi1
in repository vdr.
commit 6b73beb295c6b10ead1212c502f139c396355b29
Merge: d8aa273 b4cb8b1
Author: Tobias Grimm <etobi at debian.org>
Date: Sat Jan 7 14:43:53 2017 +0100
Merge branch 'devel-2.3.x' into e-tobi
CONTRIBUTORS | 59 +
Doxyfile.filter | 2 +-
HISTORY | 286 ++++
INSTALL | 37 +-
MANUAL | 29 +-
Make.config.template | 2 +-
Make.global | 2 +-
Makefile | 6 +-
PLUGINS.html | 18 +-
PLUGINS/src/dvbhddevice/COPYING | 340 ----
PLUGINS/src/dvbhddevice/HISTORY | 108 --
PLUGINS/src/dvbhddevice/Makefile | 123 --
PLUGINS/src/dvbhddevice/README | 18 -
PLUGINS/src/dvbhddevice/dvbhddevice.c | 97 --
PLUGINS/src/dvbhddevice/dvbhdffdevice.c | 1104 -------------
PLUGINS/src/dvbhddevice/dvbhdffdevice.h | 130 --
PLUGINS/src/dvbhddevice/hdffcmd.c | 401 -----
PLUGINS/src/dvbhddevice/hdffcmd.h | 100 --
PLUGINS/src/dvbhddevice/hdffosd.c | 836 ----------
PLUGINS/src/dvbhddevice/hdffosd.h | 24 -
PLUGINS/src/dvbhddevice/libhdffcmd/Makefile | 68 -
PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.c | 79 -
PLUGINS/src/dvbhddevice/libhdffcmd/bitbuffer.h | 43 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd.h | 42 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.c | 506 ------
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_av.h | 159 --
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.c | 45 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_base.h | 55 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_defs.h | 125 --
.../src/dvbhddevice/libhdffcmd/hdffcmd_generic.c | 165 --
.../src/dvbhddevice/libhdffcmd/hdffcmd_generic.h | 36 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.c | 120 --
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_hdmi.h | 72 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.c | 81 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_mux.h | 56 -
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.c | 720 ---------
PLUGINS/src/dvbhddevice/libhdffcmd/hdffcmd_osd.h | 170 --
.../src/dvbhddevice/libhdffcmd/hdffcmd_remote.c | 67 -
.../src/dvbhddevice/libhdffcmd/hdffcmd_remote.h | 39 -
PLUGINS/src/dvbhddevice/menu.c | 65 -
PLUGINS/src/dvbhddevice/menu.h | 29 -
PLUGINS/src/dvbhddevice/po/de_DE.po | 128 --
PLUGINS/src/dvbhddevice/po/et_EE.po | 128 --
PLUGINS/src/dvbhddevice/po/fi_FI.po | 128 --
PLUGINS/src/dvbhddevice/po/it_IT.po | 131 --
PLUGINS/src/dvbhddevice/po/uk_UA.po | 129 --
PLUGINS/src/dvbhddevice/setup.c | 476 ------
PLUGINS/src/dvbhddevice/setup.h | 66 -
PLUGINS/src/dvbsddevice/COPYING | 340 ----
PLUGINS/src/dvbsddevice/HISTORY | 65 -
PLUGINS/src/dvbsddevice/Makefile | 94 --
PLUGINS/src/dvbsddevice/README | 20 -
PLUGINS/src/dvbsddevice/dvbsddevice.c | 61 -
PLUGINS/src/dvbsddevice/dvbsdffdevice.c | 784 ---------
PLUGINS/src/dvbsddevice/dvbsdffdevice.h | 115 --
PLUGINS/src/dvbsddevice/dvbsdffosd.c | 211 ---
PLUGINS/src/dvbsddevice/dvbsdffosd.h | 22 -
PLUGINS/src/epgtableid0/Makefile | 2 +-
PLUGINS/src/epgtableid0/epgtableid0.c | 2 +-
PLUGINS/src/hello/Makefile | 2 +-
PLUGINS/src/hello/hello.c | 2 +-
PLUGINS/src/osddemo/HISTORY | 7 +
PLUGINS/src/osddemo/Makefile | 2 +-
PLUGINS/src/osddemo/osddemo.c | 70 +-
PLUGINS/src/pictures/HISTORY | 4 +
PLUGINS/src/pictures/Makefile | 2 +-
PLUGINS/src/pictures/entry.c | 2 +-
PLUGINS/src/pictures/entry.h | 2 +-
PLUGINS/src/pictures/menu.c | 4 +-
PLUGINS/src/pictures/menu.h | 2 +-
PLUGINS/src/pictures/pic2mpg | 2 +-
PLUGINS/src/pictures/pictures.c | 4 +-
PLUGINS/src/pictures/player.c | 2 +-
PLUGINS/src/pictures/player.h | 2 +-
PLUGINS/src/rcu/COPYING | 340 ----
PLUGINS/src/rcu/HISTORY | 30 -
PLUGINS/src/rcu/Makefile | 94 --
PLUGINS/src/rcu/README | 19 -
PLUGINS/src/rcu/rcu.c | 420 -----
PLUGINS/src/servicedemo/Makefile | 2 +-
PLUGINS/src/servicedemo/svccli.c | 2 +-
PLUGINS/src/servicedemo/svcsvr.c | 2 +-
PLUGINS/src/skincurses/HISTORY | 7 +
PLUGINS/src/skincurses/Makefile | 2 +-
PLUGINS/src/skincurses/skincurses.c | 8 +-
PLUGINS/src/status/Makefile | 2 +-
PLUGINS/src/status/status.c | 2 +-
PLUGINS/src/svdrpdemo/Makefile | 2 +-
PLUGINS/src/svdrpdemo/svdrpdemo.c | 2 +-
README | 4 +
args.c | 2 +-
args.h | 2 +-
audio.c | 2 +-
audio.h | 2 +-
channels.c | 351 ++--
channels.h | 114 +-
ci.c | 82 +-
ci.h | 2 +-
config.c | 17 +-
config.h | 21 +-
cutter.c | 10 +-
cutter.h | 2 +-
debian/changelog | 6 +
debian/control | 66 +-
debian/dvbhddevice.conf | 7 -
debian/dvbsddevice.conf | 7 -
debian/patches/04_newplugin.patch | 8 +-
debian/patches/06_default_svdrp_port_0.patch | 8 +-
debian/patches/12_osdbase-maxitems.patch | 14 +-
debian/patches/99_ncursesw-include.patch | 8 +-
debian/patches/series | 1 -
debian/patches/systemd.patch | 19 -
debian/rules | 9 +-
debian/vdr-plugin-dvbhddevice.docs | 1 -
debian/vdr-plugin-dvbhddevice.install | 4 -
debian/vdr-plugin-dvbsddevice.docs | 1 -
debian/vdr-plugin-dvbsddevice.install | 3 -
debian/vdr-plugin-examples.install | 1 -
debian/watch | 2 +-
device.c | 29 +-
device.h | 8 +-
diseqc.c | 2 +-
diseqc.h | 2 +-
dvbci.c | 2 +-
dvbci.h | 2 +-
dvbdevice.c | 37 +-
dvbdevice.h | 3 +-
dvbplayer.c | 106 +-
dvbplayer.h | 8 +-
dvbspu.c | 2 +-
dvbspu.h | 2 +-
dvbsubtitle.c | 5 +-
dvbsubtitle.h | 4 +-
eit.c | 119 +-
eit.h | 10 +-
eitscan.c | 22 +-
eitscan.h | 2 +-
epg.c | 270 ++--
epg.h | 72 +-
epg2html | 2 +-
filter.c | 32 +-
filter.h | 11 +-
font.c | 17 +-
font.h | 8 +-
i18n.c | 2 +-
i18n.h | 2 +-
interface.c | 12 +-
interface.h | 7 +-
keys.c | 2 +-
keys.h | 2 +-
libsi/Makefile | 2 +-
libsi/descriptor.c | 2 +-
libsi/descriptor.h | 2 +-
libsi/gendescr | 2 +-
libsi/headers.h | 2 +-
libsi/section.c | 2 +-
libsi/section.h | 2 +-
libsi/si.c | 2 +-
libsi/si.h | 2 +-
libsi/util.c | 2 +-
libsi/util.h | 2 +-
lirc.c | 2 +-
lirc.h | 2 +-
menu.c | 1582 ++++++++++--------
menu.h | 25 +-
menuitems.c | 66 +-
menuitems.h | 14 +-
newplugin | 3 +-
nit.c | 178 +--
nit.h | 16 +-
osd.c | 17 +-
osd.h | 33 +-
osdbase.c | 12 +-
osdbase.h | 3 +-
pat.c | 73 +-
pat.h | 8 +-
player.c | 2 +-
player.h | 13 +-
plugin.c | 36 +-
plugin.h | 2 +-
po/ar.po | 47 +-
po/ca_ES.po | 47 +-
po/cs_CZ.po | 47 +-
po/da_DK.po | 47 +-
po/de_DE.po | 47 +-
po/el_GR.po | 47 +-
po/es_ES.po | 47 +-
po/et_EE.po | 277 ++--
po/fi_FI.po | 47 +-
po/fr_FR.po | 47 +-
po/hr_HR.po | 47 +-
po/hu_HU.po | 47 +-
po/it_IT.po | 49 +-
po/lt_LT.po | 47 +-
po/mk_MK.po | 47 +-
po/nl_NL.po | 47 +-
po/nn_NO.po | 47 +-
po/pl_PL.po | 47 +-
po/pt_PT.po | 47 +-
po/ro_RO.po | 47 +-
po/ru_RU.po | 47 +-
po/sk_SK.po | 47 +-
po/sl_SI.po | 47 +-
po/sr_RS.po | 47 +-
po/sv_SE.po | 47 +-
po/tr_TR.po | 47 +-
po/uk_UA.po | 47 +-
po/zh_CN.po | 47 +-
positioner.c | 2 +-
positioner.h | 2 +-
receiver.c | 8 +-
receiver.h | 4 +-
recorder.c | 29 +-
recorder.h | 4 +-
recording.c | 516 +++---
recording.h | 128 +-
remote.c | 2 +-
remote.h | 2 +-
remux.c | 96 +-
remux.h | 5 +-
ringbuffer.c | 5 +-
ringbuffer.h | 6 +-
runvdr.template | 2 +-
sdt.c | 61 +-
sdt.h | 2 +-
sections.c | 2 +-
sections.h | 2 +-
shutdown.c | 29 +-
shutdown.h | 2 +-
skinclassic.c | 5 +-
skinclassic.h | 2 +-
skinlcars.c | 70 +-
skinlcars.h | 2 +-
skins.c | 2 +-
skins.h | 11 +-
skinsttng.c | 5 +-
skinsttng.h | 2 +-
sourceparams.c | 4 +-
sourceparams.h | 4 +-
sources.c | 2 +-
sources.conf | 141 +-
sources.h | 2 +-
spu.c | 2 +-
spu.h | 2 +-
status.c | 2 +-
status.h | 9 +-
summary2info | 2 +-
svdrp.c | 1685 ++++++++++++++------
svdrp.h | 114 +-
themes.c | 2 +-
themes.h | 2 +-
thread.c | 162 +-
thread.h | 96 +-
timers.c | 362 +++--
timers.h | 130 +-
tools.c | 193 ++-
tools.h | 171 +-
transfer.c | 4 +-
transfer.h | 4 +-
vdr.1 | 6 +-
vdr.5 | 2 +-
vdr.c | 378 +++--
videodir.c | 17 +-
videodir.h | 3 +-
264 files changed, 7110 insertions(+), 13045 deletions(-)
diff --cc debian/changelog
index 9bce8eb,4905387..16ef184
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
+ vdr (2.3.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org> Sat, 07 Jan 2017 13:01:41 +0100
+
-vdr (2.2.0-6) unstable; urgency=medium
+vdr (2.2.0-6~etobi1) UNRELEASED; urgency=medium
* Added Brazilian Portuguese translations for debconf provided by
Adriano Rafael Gomes (closes: #811514)
diff --cc debian/patches/series
index 864896a,c223546..9d78137
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -3,31 -3,3 +3,30 @@@
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 show an info, if it is possible to record an event in the timer-info.
+opt-41-x_timer-info.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
+
+# Patch required for the GraphTFT plugin
+opt-50_graphtft.patch
+
+# Power down idle dvb devices
+opt-60_power-saving.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list