r5633 - in /vdr/vdr-plugin-reelchannelscan/trunk/debian: changelog copyright patches/00list patches/90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch rules
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Sat Oct 27 15:34:30 UTC 2007
Author: tom-guest
Date: Sat Oct 27 15:34:30 2007
New Revision: 5633
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5633
Log:
Added 90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch
Added:
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch
Modified:
vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog?rev=5633&op=diff
==============================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog Sat Oct 27 15:34:30 2007
@@ -1,3 +1,12 @@
+vdr-plugin-reelchannelscan (0.4.3~r2-6) unstable; urgency=low
+
+ * Added 90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch (Thx to alien2924 at
+ vdrportal.de)
+ * Fixed debian-rules-ignores-make-clean-error
+ * Updated debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Sat, 27 Oct 2007 00:55:12 +0200
+
vdr-plugin-reelchannelscan (0.4.3~r2-5) unstable; urgency=low
* Release for vdrdevel 1.5.9
Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright?rev=5633&op=diff
==============================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright Sat Oct 27 15:34:30 2007
@@ -1,20 +1,10 @@
-This package was debianized by Klaus Deiss <kdeiss at web.de> on
-Sat, 20 May 2006 17:06:55 +0100.
-
-It was downloaded from:
- http://reel-multimedia.com/german/entwickler/d-plugins.html
+Upstream Homepage:
+ http://www.reel-multimedia.com
Upstream Authors:
Markus Hahn <mhahn at reel-multimedia.com>
Klaus Heppenheimer <klaus at reel-multimedia.com>
- Georg Acher <acher at baycom.de>
-
-Copyright:
- (C) 2005 Reel Multimedia
- (C) 2005 - 2006 Alberto Pachera (original channelscan up to 0.1.0)
-
-Project's homepage:
- http://www.reel-multimedia.com
+ Georg Acher <acher at baycom.de>
To contact the authors please use the vdr development mailing list or the
forum at:
@@ -27,6 +17,13 @@
Thomas Günther <tom at toms-cafe.de>
Thomas Schmidt <tschmidt at debian.org>
+Copyright:
+ (C) 2004-2005 Alberto Pachera (original channelscan up to 0.1.0)
+ (C) 2005-2006 Reel Multimedia
+
+Copyright (Debian packaging):
+ (C) 2006-2007 Klaus Deiss, Tobias Grimm, Thomas Günther, Thomas Schmidt
+
License:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,10 +35,13 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301, USA.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
The complete text of the GNU General Public License can be found
in /usr/share/common-licenses/GPL on most Debian systems.
+
+License (Debian packaging):
+ The Debian packaging is licensed under the GPL, version 2 or any
+ later version, see /usr/share/common-licenses/GPL.
Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list?rev=5633&op=diff
==============================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list Sat Oct 27 15:34:30 2007
@@ -1,3 +1,4 @@
01_dont-force-32bit
02_scanning_status_service
04_reelchannelscan-0.3.0-configdir
+90_reelchannelscan-0.4.3-vdr-1.5.10
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch?rev=5633&op=file
==============================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch (added)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch Sat Oct 27 15:34:30 2007
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_reelchannelscan-0.4.3-vdr-1.5.10.dpatch by alien2924 at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=660710#post660710
+##
+## Thomas Günther <tom at toms-cafe.de>:
+## - Added compatibility to VDR < 1.5.10
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.10.
+
+ at DPATCH@
+diff -Naur reelchannelscan-0.4.3-orig/filter.c reelchannelscan-0.4.3/filter.c
+--- reelchannelscan-0.4.3-orig/filter.c 2007-05-19 15:50:09.000000000 +0200
++++ reelchannelscan-0.4.3/filter.c 2007-10-20 13:33:05.000000000 +0200
+@@ -407,6 +407,10 @@
+ char ALangs[MAXAPIDS + 1][4] = { "" };
+ char DLangs[MAXDPIDS + 1][4] = { "" };
+ #endif
++#if VDRVERSNUM >= 10510
++ int Spids[MAXDPIDS + 1] = { 0 };
++ char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
++#endif
+ int Tpid = 0;
+ int NumApids = 0;
+ int NumDpids = 0;
+@@ -481,7 +485,11 @@
+ delete d;
+ }
+ }
++#if VDRVERSNUM >= 10510
++ Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid);
++#else
+ Channel->SetPids(Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid);
++#endif
+ //printf("#### %i %s %i %i SID %i\n",num,Channel->Name(),Vpid, Apids[0], Channel->Sid());
+ Channel->SetCaIds(CaDescriptors->CaIds());
+ Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-reelchannelscan/trunk/debian/rules?rev=5633&op=diff
==============================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/rules (original)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/rules Sat Oct 27 15:34:30 2007
@@ -42,7 +42,7 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
rm -f libvdr-*.so.*
dh_clean
More information about the pkg-vdr-dvb-changes
mailing list