[vdr-plugin-satip] 05/06: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-satip
Tobias Grimm
tiber-guest at moszumanska.debian.org
Thu Dec 3 01:59:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-satip.
commit ed28bed730151267aa573b4653743665fb98c7ff
Merge: 605ac65 c03d12d
Author: Tobias Grimm <etobi at debian.org>
Date: Wed Dec 2 23:02:00 2015 +0100
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-satip
HISTORY | 24 +++++++
Makefile | 17 +----
README | 2 +-
common.h | 64 +++++++++++++++---
config.c | 1 +
config.h | 39 ++++++-----
debian/README.Debian | 2 +-
debian/changelog | 8 +++
debian/satip.conf | 1 +
device.c | 23 ++++++-
device.h | 3 +-
deviceif.h | 3 +-
discover.c | 76 +++++++++++----------
discover.h | 14 ++--
discoverif.h | 2 +-
log.h | 5 +-
msearch.c | 7 +-
msearch.h | 2 +-
param.c | 18 ++---
po/ca_ES.po | 6 +-
po/de_DE.po | 6 +-
po/es_ES.po | 6 +-
po/fi_FI.po | 6 +-
pollerif.h | 2 +-
rtcp.c | 2 +-
rtcp.h | 2 +-
rtp.h | 2 +-
rtsp.c | 185 +++++++++++++++++++++++++++++++++++++++++----------
rtsp.h | 14 +++-
satip.c | 44 ++++++++++--
server.c | 8 ++-
setup.c | 24 ++++---
setup.h | 1 +
tuner.c | 24 ++++++-
tuner.h | 2 +
tunerif.h | 2 +-
36 files changed, 468 insertions(+), 179 deletions(-)
diff --cc debian/changelog
index c2fe147,7cbd91d..70666ad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,26 +1,31 @@@
-vdr-plugin-satip (2.2.3-1) experimental; urgency=medium
++vdr-plugin-satip (2.2.3-1) UNRELEASED; urgency=medium
+
++ [ Frank Neumann ]
+ * New upstream release
++ * adjusting debian/README.debian and debian/plugin.satip.conf
+
- -- Frank Neumann <fnu at yavdr.org> Sat, 21 Nov 2015 19:58:23 +0100
++ -- Tobias Grimm <etobi at debian.org> Wed, 02 Dec 2015 23:00:32 +0100
+
-vdr-plugin-satip (2.2.2-2) experimental; urgency=medium
+vdr-plugin-satip (2.2.0-4) unstable; urgency=medium
- * adjusting debian/README.debian and debian/plugin.satip.conf
+ * Fixed debian/copyright - the license actually is plain GPL-2
+ * Added Vcs-Git/Vcs-Browser fields
- -- Frank Neumann <fnu at yavdr.org> Sun, 26 Apr 2015 13:26:56 +0200
+ -- Tobias Grimm <etobi at debian.org> Sun, 11 Oct 2015 17:58:34 +0200
-vdr-plugin-satip (2.2.2-1) experimental; urgency=medium
+vdr-plugin-satip (2.2.0-3) unstable; urgency=medium
- * New upstream release
+ * Preparing upload (Closes: #756298)
+ * Dropped -dbg package in favour of future automatic debug packages
+ * Switched to machine readable copyright file
- -- Frank Neumann <fnu at yavdr.org> Sun, 26 Apr 2015 12:39:11 +0200
+ -- Tobias Grimm <etobi at debian.org> Sun, 27 Sep 2015 18:06:24 +0200
-vdr-plugin-satip (2.2.1-1) experimental; urgency=medium
+vdr-plugin-satip (2.2.0-2) experimental; urgency=medium
- * New upstream release
+ * Now supporting the /etc/vdr/conf.d mechanism
- -- Frank Neumann <fnu at yavdr.org> Sat, 25 Apr 2015 21:26:52 +0200
+ -- Tobias Grimm <etobi at debian.org> Mon, 23 Mar 2015 23:14:01 +0100
vdr-plugin-satip (2.2.0-1) experimental; urgency=medium
diff --cc debian/satip.conf
index bb8a000,6ab738c..8103ddf
--- a/debian/satip.conf
+++ b/debian/satip.conf
@@@ -5,10 -5,8 +5,11 @@@
# - /usr/share/doc/vdr-plugin-satip/README.gz
# - vdr -Psatip --help
#
+
+[satip]
+
# -d <num>, --devices=<number> set number of devices to be created
+ # (default device count is 2)
# -t <mode>, --trace=<mode> set the tracing mode
# -s <ipaddr>|<model>|<desc>, --server=<ipaddr1>|<model1>|<desc1>;<ipaddr2>|<model2>|<desc2>
# define hard-coded SAT>IP server(s)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-satip.git
More information about the pkg-vdr-dvb-changes
mailing list