[vdr] 01/05: Merge branch 'master' into e-tobi
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Dec 27 13:02:15 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.8-1_etobi1
in repository vdr.
commit b2d0a9a716100b0e66ea100ee8b4725822c5b358
Merge: 98d61b1 e2bd096
Author: Tobias Grimm <etobi at debian.org>
Date: Wed Dec 27 12:16:05 2017 +0100
Merge branch 'master' into e-tobi
CONTRIBUTORS | 52 ++
HISTORY | 280 ++++++++
INSTALL | 6 +-
MANUAL | 24 +-
Make.config.template | 8 +-
Makefile | 33 +-
PLUGINS.html | 24 +
PLUGINS/src/epgtableid0/Makefile | 8 +-
PLUGINS/src/hello/Makefile | 17 +-
PLUGINS/src/osddemo/Makefile | 8 +-
PLUGINS/src/pictures/Makefile | 17 +-
PLUGINS/src/servicedemo/Makefile | 11 +-
PLUGINS/src/skincurses/Makefile | 17 +-
PLUGINS/src/status/Makefile | 8 +-
PLUGINS/src/svdrpdemo/Makefile | 8 +-
camresponses.conf | 29 +
channels.c | 20 +-
channels.h | 3 +-
ci.c | 1007 ++++++++++++++++++++++-------
ci.h | 228 ++++++-
config.c | 6 +-
config.h | 10 +-
cutter.c | 4 +-
debian/.vdr-patches | 10 +-
debian/abi-version | 2 +-
debian/changelog | 16 +
debian/control | 2 +-
debian/patches/04_newplugin.patch | 6 +-
debian/patches/12_osdbase-maxitems.patch | 8 +-
debian/patches/systemd.patch | 17 +
debian/patchinfo | 1 -
debian/po/cs.po | 20 +-
debian/po/da.po | 23 +-
debian/po/de.po | 13 +-
debian/po/es.po | 22 +-
debian/po/fi.po | 73 +++
debian/po/fr.po | 44 +-
debian/po/gl.po | 14 +-
debian/po/it.po | 22 +-
debian/po/ja.po | 20 +-
debian/po/nl.po | 40 +-
debian/po/pt.po | 18 +-
debian/po/pt_BR.po | 21 +-
debian/po/ru.po | 34 +-
debian/po/sv.po | 14 +-
debian/po/templates.pot | 13 +-
debian/po/vi.po | 73 +++
debian/vdr.templates | 2 +-
device.c | 237 +++++--
device.h | 46 +-
diseqc.c | 10 +-
diseqc.h | 6 +-
dvbdevice.c | 314 +++++++--
dvbdevice.h | 4 +-
eit.c | 13 +-
eit.h | 7 +-
epg.c | 48 +-
epg.h | 20 +-
filter.c | 11 +-
filter.h | 3 +-
libsi/Makefile | 8 +-
lirc.c | 21 +-
menu.c | 356 +++++-----
mtd.c | 350 ++++++++++
mtd.h | 191 ++++++
newplugin | 17 +-
osdbase.c | 9 +-
osdbase.h | 3 +-
po/ar.po | 14 +-
po/ca_ES.po | 14 +-
po/cs_CZ.po | 14 +-
po/da_DK.po | 14 +-
po/de_DE.po | 14 +-
po/el_GR.po | 14 +-
po/es_ES.po | 14 +-
po/et_EE.po | 14 +-
po/fi_FI.po | 44 +-
po/fr_FR.po | 14 +-
po/hr_HR.po | 14 +-
po/hu_HU.po | 14 +-
po/it_IT.po | 16 +-
po/lt_LT.po | 14 +-
po/mk_MK.po | 14 +-
po/nl_NL.po | 14 +-
po/nn_NO.po | 14 +-
po/pl_PL.po | 14 +-
po/pt_PT.po | 14 +-
po/ro_RO.po | 14 +-
po/ru_RU.po | 1042 +++++++++++++++---------------
po/sk_SK.po | 14 +-
po/sl_SI.po | 14 +-
po/sr_RS.po | 14 +-
po/sv_SE.po | 14 +-
po/tr_TR.po | 14 +-
po/uk_UA.po | 14 +-
po/zh_CN.po | 14 +-
receiver.c | 14 +-
receiver.h | 7 +-
recording.c | 45 +-
recording.h | 9 +-
remux.c | 113 +++-
remux.h | 41 +-
ringbuffer.c | 7 +-
ringbuffer.h | 4 +-
skinlcars.c | 8 +-
skins.h | 25 +-
sources.conf | 1 +
status.h | 15 +-
svdrp.c | 210 +++---
svdrp.h | 10 +-
thread.c | 302 ++++++++-
thread.h | 33 +-
timers.c | 80 ++-
timers.h | 22 +-
tools.c | 18 +-
tools.h | 54 +-
vdr.5 | 86 ++-
vdr.c | 25 +-
118 files changed, 5110 insertions(+), 1501 deletions(-)
diff --cc debian/.vdr-patches
index 0b0727d,099c4be..8774fa4
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,11 -1,5 +1,11 @@@
- 04_newplugin.patch:bd963b34c9b1b473f445535d83c30ec1
- 06_default_svdrp_port_0.patch:98fc8d7a9f450374de5e5690ad4c98c7
- 12_osdbase-maxitems.patch:c5bf663d8e89d441eb9c040403e19228
- 99_ncursesw-include.patch:98a6f4705b312dc9de9775e867e95d54
- systemd.patch:263b8db8a6cb952fe9157dbf4c76aaa5
+ 04_newplugin.patch:588683d61d591ea5dbeebb3b0633ae3a
+ 06_default_svdrp_port_0.patch:e75a74f487a4f07bcd1b73319203af59
+ 12_osdbase-maxitems.patch:401fc8efc9900a9a766730885ac456df
+ 99_ncursesw-include.patch:fd58fcdbff50c97b0db92b9c45c6ec43
+ systemd.patch:367980e92cbcfcf556127ac9510e5efd
+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/abi-version
index 59c04ee,e7099cb..f9b75cf
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-2.2.0-multipatch-1
-vdr-abi-2.3.8-debian
++vdr-abi-2.3.8-multipatch-1
diff --cc debian/changelog
index 78d4c5c,4c7ba2b..a44e484
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,28 +1,30 @@@
-vdr (2.3.8-1) unstable; urgency=medium
++vdr (2.3.8-1~etobi1) unstable; urgency=medium
+
+ [ Tobias Grimm ]
+ * New upstream release (Closes: #853698)
-
- [ Helmut Grohne ]
- * Switch vdr-dev to Architecture: any (closes: #853958)
-
- -- Tobias Grimm <etobi at debian.org> Mon, 14 Aug 2017 20:57:41 +0200
-
-vdr (2.3.7-1) unstable; urgency=medium
-
- * New upstream development release
+ * Updated patches
+ * Dropped rcu plugin from vdr-plugins-examples - this plugin is not shipped
+ with the upstream VDR sources anymore
+ * Dropped vdr-plugin-dvbhddevice and vdr-plugin-dvbsddevice plugin - these
+ plugins are not shipped with the upstream VDR sources anymore and will be
+ provided in new separate source packages
+ * Made vdr depend on lsb-base (>= 3.0-6), which is required by the init script
+ * Dropped vdr-dbg - migration to automatically created debug symbol package
+
- -- Tobias Grimm <etobi at debian.org> Sat, 24 Jun 2017 19:27:43 +0200
++ [ Helmut Grohne ]
++ * Switch vdr-dev to Architecture: any (closes: #853958)
++
+vdr (2.3.2-1~etobi1) unstable; urgency=medium
-vdr (2.2.0-6) unstable; urgency=medium
+ * New upstream release
+ * Dropped opt-41-x_timer-info.patch
+ * Dropped opt-50_graphtft.patch
+ * Updated patches
+ * Updated opt-60_power-saving.patch to the version provided for 2.3.x
+
+ -- Tobias Grimm <etobi at debian.org> Sat, 07 Jan 2017 20:14:01 +0100
+
+vdr (2.2.0-6~etobi1) unstable; urgency=medium
* Added Brazilian Portuguese translations for debconf provided by
Adriano Rafael Gomes (closes: #811514)
diff --cc debian/patchinfo
index 20c5f3c,fa8df83..3d80e18
--- a/debian/patchinfo
+++ b/debian/patchinfo
@@@ -28,38 -28,3 +28,37 @@@ systemd.patc
Use libsystemd instead of transitional libsystemd-daemon
+opt-27_ttxtsubs.patch
+ Tobias Grimm <vdr at e-tobi.net>
+
+ This patch is needed for the ttxtsubs plugin.
+
+opt-37-x_menuorg.patch
+ Tobias Grimm <tg at e-tobi.net>
+
+ This patch is required by the MenuOrg plugin. It adds a service interface,
+ that can be implemented by plugins to reorganize VDR's main menu entries
+ with the ability to create custom sub menus. This is version 0.4.s of the
+ patch
+
+opt-41-x_timer-info.patch
+ Andreas Brugger <brougs78 at gmx.net>, Thomas G�nther <tom at toms-cafe.de>
+
+ Shows info, if it is possible to record an event in the timer-info of vdr -
+ see README.timer-info for details.
+
+opt-42-x_MainMenuHooks.patch
+ Frank Schmirler <vdrdev at schmirler.de>
+
+ This patch allows plugins to replace the VDR mainmenus "Schedule",
+ "Channels", "Timers" and "Recordings" by a different implementation.
+
+opt-45_yaepg.patch
+ bball950 at yahoo.com
+
+ This patch is needed for the yaepg plugin.
+
+opt-50_graphtft.patch
+ Jörg Wendel (Horchi)
+
+ Patch required for the GraphTFT plugin.
-
--
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