[vdr] 01/03: Merge branch 'master' into e-tobi
Tobias Grimm
tiber-guest at moszumanska.debian.org
Thu Feb 12 17:53:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to annotated tag debian/2.1.10-1_etobi1
in repository vdr.
commit 13513721c9a834781a4f1f8faf8f469e5732308d
Merge: 3561a46 2962a72
Author: etobi <git at e-tobi.net>
Date: Thu Feb 12 18:46:45 2015 +0100
Merge branch 'master' into e-tobi
Conflicts:
debian/.vdr-patches
debian/abi-version
debian/changelog
debian/patches/06_default_svdrp_port_0.patch
debian/patches/12_osdbase-maxitems.patch
debian/patches/99_ncursesw-include.patch
debian/vdr.postinst
CONTRIBUTORS | 19 ++++-
HISTORY | 49 ++++++++++-
INSTALL | 2 +-
MANUAL | 17 ++++
Make.config.template | 5 +-
Makefile | 7 +-
PLUGINS/src/dvbhddevice/HISTORY | 4 +
PLUGINS/src/dvbhddevice/dvbhddevice.c | 2 +-
PLUGINS/src/dvbhddevice/hdffosd.c | 4 +-
PLUGINS/src/dvbhddevice/po/it_IT.po | 7 +-
UPDATE-2.2.0 | 33 +++++++-
config.c | 11 ++-
config.h | 13 +--
debian/abi-version | 2 +-
debian/changelog | 9 +++
debian/control | 2 +-
libsi/Makefile | 3 +-
libsi/si.c | 15 +++-
libsi/si.h | 5 +-
menu.c | 23 ++++--
menuitems.c | 4 +-
osd.c | 62 ++++++++------
osd.h | 14 ++--
po/ar.po | 11 ++-
po/ca_ES.po | 11 ++-
po/cs_CZ.po | 11 ++-
po/da_DK.po | 11 ++-
po/de_DE.po | 15 +++-
po/el_GR.po | 11 ++-
po/es_ES.po | 11 ++-
po/et_EE.po | 45 ++++++-----
po/fi_FI.po | 13 ++-
po/fr_FR.po | 148 ++++++++++++++++++----------------
po/hr_HR.po | 11 ++-
po/hu_HU.po | 14 +++-
po/it_IT.po | 35 +++++---
po/lt_LT.po | 19 +++--
po/mk_MK.po | 115 ++++++++++++++------------
po/nl_NL.po | 120 ++++++++++++++-------------
po/nn_NO.po | 11 ++-
po/pl_PL.po | 11 ++-
po/pt_PT.po | 11 ++-
po/ro_RO.po | 15 +++-
po/ru_RU.po | 11 ++-
po/sk_SK.po | 11 ++-
po/sl_SI.po | 11 ++-
po/sr_RS.po | 11 ++-
po/sv_SE.po | 11 ++-
po/tr_TR.po | 11 ++-
po/uk_UA.po | 21 +++--
po/zh_CN.po | 11 ++-
vdr.1 | 7 +-
vdr.c | 25 +++++-
53 files changed, 778 insertions(+), 313 deletions(-)
diff --cc debian/abi-version
index 36ee51b,19deeb8..43e2b86
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-2.1.9-multipatch
-vdr-abi-2.1.10-debian
++vdr-abi-2.1.10-multipatch
diff --cc debian/changelog
index 8be6cc8,f671650..e0de806
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,18 +1,27 @@@
-vdr (2.1.10-1) UNRELEASED; urgency=medium
++vdr (2.1.10-1~etobi1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org> Thu, 12 Feb 2015 18:34:24 +0100
+
-vdr (2.0.6-2) unstable; urgency=medium
+vdr (2.1.9-1~etobi1) unstable; urgency=medium
+ * New upstream release
+ * Merged from Jessie-version 2.0.3-3: Fixed use of getent in postinst script
+ for detecting existing vdr user and group (Closes: #770773)
+ * Standards-Version: 3.9.6
- -- Tobias Grimm <etobi at debian.org> Mon, 08 Dec 2014 22:48:55 +0100
+ -- Tobias Grimm <etobi at debian.org> Mon, 09 Feb 2015 18:53:03 +0100
-vdr (2.0.6-1) unstable; urgency=medium
+vdr (2.1.8-1~etobi1) unstable; urgency=medium
+
+ * New upstream release
+ * Dropped opt-22-x_edit_marks.patch
+ * Added bash completion for svdrpesend (taken from yaVDR / Lars Hanisch)
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 08 Feb 2015 18:31:07 +0100
+
+vdr (2.0.6-1~etobi1) unstable; urgency=low
* New upstream release
* Standards-Version: 3.9.5
--
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