[SCM] vdr-plugin-vompserver packaging repository branch, master, updated. debian/0.3.1-4-5-g0479b5f
etobi
git at e-tobi.net
Sat Mar 16 13:31:49 UTC 2013
The following commit has been merged in the master branch:
commit 757cabad072f388bd68cd89fc3325c2ba73c3fa1
Author: etobi <git at e-tobi.net>
Date: Sat Mar 16 13:45:34 2013 +0100
* New upstream release
* Using debhelper 9
* Updated debian/copyright
* Build-depend on vdr-dev (>= 1.7.40)
* Standards-Version: 3.9.4
diff --git a/debian/changelog b/debian/changelog
index 366d775..539f108 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+vdr-plugin-vompserver (0.4.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Using debhelper 9
+ * Updated debian/copyright
+ * Build-depend on vdr-dev (>= 1.7.40)
+ * Standards-Version: 3.9.4
+
+ -- Tobias Grimm <etobi at debian.org> Sat, 16 Mar 2013 13:42:18 +0100
+
vdr-plugin-vompserver (0.3.1-4) experimental; urgency=low
* Fixing build with VDR 1.7.27
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1160ea2..e5a3fd7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: video
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Marten Richter <marten.richter at freenet.de>, Tobias Grimm <etobi at debian.org>
-Origin: ctvdr
-Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.27)
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), vdr-dev (>= 1.7.40), pkg-config
+Standards-Version: 3.9.4
Package: vdr-plugin-vompserver
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index a56a151..dcca980 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ Copyright for config.c/config.h/log.c/log.h/tcp.c/tcp.h:
(c) 2003-2005 University Of Bradford
Copyright (Debian packaging):
- (C) 2005-2012 Marten Richter, Peter Siering, Tobias Grimm, Thomas Günther,
+ (C) 2005-2013 Marten Richter, Peter Siering, Tobias Grimm, Thomas Günther,
Thomas Schmidt
License:
diff --git a/debian/install b/debian/install
index 38bc66a..f89df45 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
-libvdr-vompserver.so.* usr/lib/vdr/plugins/
debian/vomp.conf etc/vdr/plugins/
-l10n/* usr/share/vdr-plugin-vompserver/l10n/
\ No newline at end of file
+l10n/* usr/share/vdr-plugin-vompserver/l10n/
\ No newline at end of file
diff --git a/debian/patches/10-rrprocstart.patch b/debian/patches/10-rrprocstart.patch
deleted file mode 100644
index ccc6d63..0000000
--- a/debian/patches/10-rrprocstart.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-rrprocstart.dpatch by <marten.richter at freenet.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Backport of a bug in rrproc
-
- at DPATCH@
-diff -u vdr-plugin-vompserver-new/vompclientrrproc.c vdr-plugin-vompserver-0.3.1/vompclientrrproc.c
---- vdr-plugin-vompserver-new/vompclientrrproc.c 2010-07-05 19:20:11.000000000 +0200
-+++ vdr-plugin-vompserver-0.3.1/vompclientrrproc.c 2010-07-05 19:24:05.000000000 +0200
-@@ -87,9 +87,25 @@
-
- if (req_queue.size() != 0)
- {
-- log->log("RRProc", Log::ERR, "threadMethod err 1");
-- threadUnlock();
-- return;
-+ log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets");
-+ while (req_queue.size())
-+ {
-+ //log->log("RRProc", Log::DEBUG, "thread while");
-+ req = req_queue.front();
-+ req_queue.pop();
-+
-+ threadUnlock(); // allow recvRequest to be queuing packets while we are working on this one
-+
-+ if (!processPacket())
-+ {
-+ log->log("RRProc", Log::ERR, "processPacket exited with fail");
-+ return;
-+ }
-+
-+ threadLock();
-+ }
-+ log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets done.");
-+
- }
-
- while(1)
diff --git a/debian/patches/gcc-fixes.patch b/debian/patches/gcc-fixes.patch
deleted file mode 100644
index c74da23..0000000
--- a/debian/patches/gcc-fixes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc-fixes.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-plugin-vompserver-0.3.1~/mediafile.c vdr-plugin-vompserver-0.3.1/mediafile.c
---- vdr-plugin-vompserver-0.3.1~/mediafile.c 2008-12-23 18:27:32.000000000 +0100
-+++ vdr-plugin-vompserver-0.3.1/mediafile.c 2012-05-08 13:40:39.492005040 +0200
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <stddef.h>
- #include <dirent.h>
- #include <iostream>
- #include "log.h"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ab1b664..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-10-rrprocstart.patch
-vdr1.7.27.patch
-gcc-fixes.patch
diff --git a/debian/patches/vdr1.7.27.patch b/debian/patches/vdr1.7.27.patch
deleted file mode 100644
index 22668fc..0000000
--- a/debian/patches/vdr1.7.27.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## vdr1.7.27.dpatch by <hondansx @ vdrportal.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes vdr 1.7.27 issues
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-plugin-vompserver-0.3.1~/mvpreceiver.c vdr-plugin-vompserver-0.3.1/mvpreceiver.c
---- vdr-plugin-vompserver-0.3.1~/mvpreceiver.c 2009-02-22 17:08:57.000000000 +0100
-+++ vdr-plugin-vompserver-0.3.1/mvpreceiver.c 2012-05-08 13:32:50.271828787 +0200
-@@ -39,8 +39,10 @@
- : cReceiver(channel->Ca(), 0, 7, channel->Vpid(), channel->Ppid(), channel->Apid1(), channel->Apid2(), channel->Dpid1(), channel->Dpid2(), channel->Tpid())
- #elif VDRVERSNUM < 10500
- : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
--#else
-+#elif VDRVERSNUM < 10727
- : cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
-+#else
-+: cReceiver(channel, 0)
- #endif
- {
- logger = Log::getInstance();
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-plugin-vompserver-0.3.1~/vompclientrrproc.c vdr-plugin-vompserver-0.3.1/vompclientrrproc.c
---- vdr-plugin-vompserver-0.3.1~/vompclientrrproc.c 2012-05-08 13:32:50.000000000 +0200
-+++ vdr-plugin-vompserver-0.3.1/vompclientrrproc.c 2012-05-08 13:34:07.088683323 +0200
-@@ -615,7 +615,11 @@
-
- for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording))
- {
-+#if VDRVERSNUM < 10727
- resp->addULONG(recording->start);
-+#else
-+ resp->addULONG(recording->Start());
-+#endif
- resp->addString(recording->Name());
- resp->addString(recording->FileName());
- }
-@@ -1770,9 +1774,14 @@
- {
- for (const cMark *m = Marks.First(); m; m = Marks.Next(m))
- {
-+#if VDRVERSNUM < 10727
- log->log("RRProc", Log::DEBUG, "found Mark %i", m->position);
--
- resp->addULONG(m->position);
-+#else
-+ log->log("RRProc", Log::DEBUG, "found Mark %i", m->Position());
-+ resp->addULONG(m->Position());
-+#endif
-+
- }
- }
- else
diff --git a/debian/rules b/debian/rules
index 9f487b6..25d9982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
-
%:
dh $@
-override_dh_auto_build:
- dh_auto_build -- all $(MAKE_OPTIONS)
-
-override_dh_auto_clean:
- $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
- rm -rf locale libvdr-*.so.*
-
override_dh_gencontrol:
sh /usr/share/vdr-dev/dependencies.sh
dh_gencontrol
--
vdr-plugin-vompserver packaging repository
More information about the pkg-vdr-dvb-changes
mailing list