[vdr] 01/03: Merge branch 'master' into e-tobi
Tobias Grimm
tiber-guest at moszumanska.debian.org
Thu Feb 19 11:38:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to annotated tag debian/2.2.0-1_etobi1
in repository vdr.
commit 5b9136d7b203d84fe97e1b8e664faff97940905a
Merge: 2e21597 c1c99f7
Author: etobi <git at e-tobi.net>
Date: Thu Feb 19 12:28:51 2015 +0100
Merge branch 'master' into e-tobi
Conflicts:
debian/changelog
CONTRIBUTORS | 24 +++-
HISTORY | 35 +++++-
INSTALL | 2 +-
MANUAL | 2 +-
PLUGINS.html | 4 +-
PLUGINS/src/dvbhddevice/HISTORY | 4 +
PLUGINS/src/dvbhddevice/dvbhddevice.c | 2 +-
PLUGINS/src/dvbhddevice/po/de_DE.po | 6 +-
PLUGINS/src/dvbhddevice/po/et_EE.po | 6 +-
PLUGINS/src/dvbhddevice/po/fi_FI.po | 6 +-
PLUGINS/src/dvbhddevice/po/it_IT.po | 6 +-
PLUGINS/src/dvbhddevice/po/uk_UA.po | 6 +-
PLUGINS/src/dvbsddevice/HISTORY | 4 +
PLUGINS/src/dvbsddevice/dvbsddevice.c | 4 +-
PLUGINS/src/epgtableid0/HISTORY | 4 +
PLUGINS/src/epgtableid0/epgtableid0.c | 4 +-
PLUGINS/src/hello/HISTORY | 4 +
PLUGINS/src/hello/hello.c | 4 +-
PLUGINS/src/hello/po/ca_ES.po | 4 +-
PLUGINS/src/hello/po/cs_CZ.po | 4 +-
PLUGINS/src/hello/po/da_DK.po | 4 +-
PLUGINS/src/hello/po/de_DE.po | 4 +-
PLUGINS/src/hello/po/el_GR.po | 4 +-
PLUGINS/src/hello/po/es_ES.po | 4 +-
PLUGINS/src/hello/po/et_EE.po | 4 +-
PLUGINS/src/hello/po/fi_FI.po | 4 +-
PLUGINS/src/hello/po/fr_FR.po | 4 +-
PLUGINS/src/hello/po/hr_HR.po | 4 +-
PLUGINS/src/hello/po/hu_HU.po | 4 +-
PLUGINS/src/hello/po/it_IT.po | 4 +-
PLUGINS/src/hello/po/lt_LT.po | 4 +-
PLUGINS/src/hello/po/nl_NL.po | 4 +-
PLUGINS/src/hello/po/nn_NO.po | 4 +-
PLUGINS/src/hello/po/pl_PL.po | 4 +-
PLUGINS/src/hello/po/pt_PT.po | 4 +-
PLUGINS/src/hello/po/ro_RO.po | 4 +-
PLUGINS/src/hello/po/ru_RU.po | 4 +-
PLUGINS/src/hello/po/sk_SK.po | 4 +-
PLUGINS/src/hello/po/sl_SI.po | 4 +-
PLUGINS/src/hello/po/sv_SE.po | 4 +-
PLUGINS/src/hello/po/tr_TR.po | 4 +-
PLUGINS/src/hello/po/zh_CN.po | 6 +-
PLUGINS/src/osddemo/HISTORY | 4 +
PLUGINS/src/osddemo/osddemo.c | 4 +-
PLUGINS/src/pictures/HISTORY | 4 +
PLUGINS/src/pictures/pictures.c | 4 +-
PLUGINS/src/pictures/po/de_DE.po | 4 +-
PLUGINS/src/pictures/po/et_EE.po | 4 +-
PLUGINS/src/pictures/po/fi_FI.po | 4 +-
PLUGINS/src/pictures/po/fr_FR.po | 4 +-
PLUGINS/src/pictures/po/it_IT.po | 4 +-
PLUGINS/src/pictures/po/lt_LT.po | 4 +-
PLUGINS/src/pictures/po/ru_RU.po | 6 +-
PLUGINS/src/pictures/po/sk_SK.po | 4 +-
PLUGINS/src/rcu/HISTORY | 4 +
PLUGINS/src/rcu/rcu.c | 4 +-
PLUGINS/src/servicedemo/HISTORY | 4 +
PLUGINS/src/servicedemo/svccli.c | 4 +-
PLUGINS/src/servicedemo/svcsvr.c | 4 +-
PLUGINS/src/skincurses/HISTORY | 4 +
PLUGINS/src/skincurses/po/de_DE.po | 4 +-
PLUGINS/src/skincurses/po/et_EE.po | 4 +-
PLUGINS/src/skincurses/po/fi_FI.po | 4 +-
PLUGINS/src/skincurses/po/it_IT.po | 4 +-
PLUGINS/src/skincurses/po/lt_LT.po | 4 +-
PLUGINS/src/skincurses/po/ru_RU.po | 4 +-
PLUGINS/src/skincurses/po/sk_SK.po | 4 +-
PLUGINS/src/skincurses/skincurses.c | 4 +-
PLUGINS/src/status/HISTORY | 4 +
PLUGINS/src/status/status.c | 4 +-
PLUGINS/src/svdrpdemo/HISTORY | 4 +
PLUGINS/src/svdrpdemo/svdrpdemo.c | 4 +-
config.h | 10 +-
debian/changelog | 6 +
dvbplayer.c | 6 +-
po/ar.po | 40 +++----
po/ca_ES.po | 8 +-
po/cs_CZ.po | 116 +++++++++----------
po/da_DK.po | 4 +-
po/de_DE.po | 19 +--
po/el_GR.po | 4 +-
po/es_ES.po | 124 ++++++++++----------
po/et_EE.po | 18 +--
po/fi_FI.po | 12 +-
po/fr_FR.po | 66 +++++------
po/hr_HR.po | 8 +-
po/hu_HU.po | 212 +++++++++++++++++-----------------
po/it_IT.po | 14 +--
po/lt_LT.po | 60 +++++-----
po/mk_MK.po | 16 +--
po/nl_NL.po | 4 +-
po/nn_NO.po | 4 +-
po/pl_PL.po | 123 ++++++++++----------
po/pt_PT.po | 6 +-
po/ro_RO.po | 14 +--
po/ru_RU.po | 6 +-
po/sk_SK.po | 175 ++++++++++++++--------------
po/sl_SI.po | 4 +-
po/sr_RS.po | 6 +-
po/sv_SE.po | 127 ++++++++++----------
po/tr_TR.po | 6 +-
po/uk_UA.po | 14 +--
po/zh_CN.po | 24 ++--
positioner.c | 3 +-
recording.c | 3 +-
sources.conf | 3 +-
svdrpsend.1 | 2 +-
vdr.1 | 4 +-
vdr.5 | 4 +-
109 files changed, 862 insertions(+), 760 deletions(-)
diff --cc debian/changelog
index c3874e0,aca3e09..baedf0f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,18 @@@
-vdr (2.2.0-1) UNRELEASED; urgency=medium
++vdr (2.2.0-1~etobi1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org> Thu, 19 Feb 2015 12:18:30 +0100
+
-vdr (2.0.6-2) unstable; urgency=medium
+vdr (2.1.10-1~etobi1) unstable; urgency=medium
+ * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org> Thu, 12 Feb 2015 18:51:55 +0100
+
+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
--
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