r5629 - in /vdr/vdr-plugin-channelscan/trunk/debian: changelog copyright patches/00list patches/03_g++4.1.dpatch patches/90_APIVERSION.dpatch patches/90_channelscan-0.1.0-1.5.10.dpatch rules watch
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Thu Oct 25 21:56:59 UTC 2007
Author: tom-guest
Date: Thu Oct 25 21:56:59 2007
New Revision: 5629
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=5629
Log:
New upstream release 0.1.0
Added:
vdr/vdr-plugin-channelscan/trunk/debian/patches/90_channelscan-0.1.0-1.5.10.dpatch
vdr/vdr-plugin-channelscan/trunk/debian/watch
Removed:
vdr/vdr-plugin-channelscan/trunk/debian/patches/03_g++4.1.dpatch
vdr/vdr-plugin-channelscan/trunk/debian/patches/90_APIVERSION.dpatch
Modified:
vdr/vdr-plugin-channelscan/trunk/debian/changelog
vdr/vdr-plugin-channelscan/trunk/debian/copyright
vdr/vdr-plugin-channelscan/trunk/debian/patches/00list
vdr/vdr-plugin-channelscan/trunk/debian/rules
Modified: vdr/vdr-plugin-channelscan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-channelscan/trunk/debian/changelog?rev=5629&op=diff
==============================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-channelscan/trunk/debian/changelog Thu Oct 25 21:56:59 2007
@@ -1,3 +1,15 @@
+vdr-plugin-channelscan (0.1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Removed 03_g++4.1.dpatch (fixed upstream)
+ * Removed 90_APIVERSION.dpatch (fixed upstream)
+ * Added 90_channelscan-0.1.0-1.5.10.dpatch (Thx to yolgecen at vdrportal.de)
+ * Added debian/watch file for uscan
+ * Fixed debian-rules-ignores-make-clean-error
+ * Added full license disclaimer and copyright years to debian/copyright
+
+ -- Thomas Günther <tom at toms-cafe.de> Thu, 25 Oct 2007 23:54:33 +0200
+
vdr-plugin-channelscan (0.0.5a-18) experimental; urgency=low
* Release for vdrdevel 1.5.9
Modified: vdr/vdr-plugin-channelscan/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-channelscan/trunk/debian/copyright?rev=5629&op=diff
==============================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-channelscan/trunk/debian/copyright Thu Oct 25 21:56:59 2007
@@ -1,17 +1,38 @@
-This package was debianized by Thomas Günther <tom at toms-cafe.de> on
-Fri, 6 Jan 2006 22:47:08 +0100.
+Upstream Homepage:
+ http://kikko77.altervista.org
-It was downloaded from http://kikko77.altervista.org
-
-Upstream Author: Alberto Pachera <kikko77 at altervista.org>
+Upstream Author:
+ Alberto Pachera <kikko77 at altervista.org>
Debian Maintainers:
-
- Tobias Grimm <tg at e-tobi.net>
- Thomas Günther <tom at toms-cafe.de>
- Thomas Schmidt <tschmidt at debian.org>
+ Tobias Grimm <tg at e-tobi.net>
+ Thomas Günther <tom at toms-cafe.de>
+ Thomas Schmidt <tschmidt at debian.org>
Copyright:
+ (C) 2004-2006 Alberto Pachera
-It may be redistributed under the terms of the GNU GPL, Version 2
-found on Debian systems in the file /usr/share/common-licenses/GPL .
+Copyright (Debian packaging):
+ (C) 2006-2007 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ 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 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-channelscan/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-channelscan/trunk/debian/patches/00list?rev=5629&op=diff
==============================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-channelscan/trunk/debian/patches/00list Thu Oct 25 21:56:59 2007
@@ -1,5 +1,3 @@
01_Makefile-fPIC-fix
02_fix-includes
-03_g++4.1
-
-90_APIVERSION.dpatch
+90_channelscan-0.1.0-1.5.10
Added: vdr/vdr-plugin-channelscan/trunk/debian/patches/90_channelscan-0.1.0-1.5.10.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-channelscan/trunk/debian/patches/90_channelscan-0.1.0-1.5.10.dpatch?rev=5629&op=file
==============================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/patches/90_channelscan-0.1.0-1.5.10.dpatch (added)
+++ vdr/vdr-plugin-channelscan/trunk/debian/patches/90_channelscan-0.1.0-1.5.10.dpatch Thu Oct 25 21:56:59 2007
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_channelscan-0.1.0-1.5.10.dpatch by yolgecen at vdrportal.de
+## http://vdrportal.de/board/thread.php?threadid=69815
+##
+## 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 -ur channelscan-0.1.0/filter.c channelscan-0.1.0_vdr-1.5.10/filter.c
+--- channelscan-0.1.0/filter.c 2005-09-20 19:21:25.000000000 +0200
++++ channelscan-0.1.0_vdr-1.5.10/filter.c 2007-10-15 23:43:08.000000000 +0200
+@@ -372,6 +372,10 @@
+ int Dpids[MAXDPIDS + 1] = { 0 };
+ char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" };
+ char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
++#if VDRVERSNUM >= 10510
++ int Spids[MAXDPIDS + 1] = { 0 };
++ char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
++#endif
+ int Tpid = 0;
+ int NumApids = 0;
+ int NumDpids = 0;
+@@ -445,7 +449,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
+ Channel->SetCaIds(CaDescriptors->CaIds());
+ Channel->SetCaDescriptors(CaDescriptorHandler.AddCaDescriptors(CaDescriptors));
+ }
Modified: vdr/vdr-plugin-channelscan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-channelscan/trunk/debian/rules?rev=5629&op=diff
==============================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/rules (original)
+++ vdr/vdr-plugin-channelscan/trunk/debian/rules Thu Oct 25 21:56:59 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
Added: vdr/vdr-plugin-channelscan/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-channelscan/trunk/debian/watch?rev=5629&op=file
==============================================================================
--- vdr/vdr-plugin-channelscan/trunk/debian/watch (added)
+++ vdr/vdr-plugin-channelscan/trunk/debian/watch Thu Oct 25 21:56:59 2007
@@ -1,0 +1,4 @@
+version=3
+opts=filenamemangle=s/.*(vdr-channelscan-.*\.tgz).*/$1/ \
+ http://kikko77.altervista.org/index.php?mod=Download \
+ index.php\?mod=Download.*/vdr-channelscan-(.*)\.tgz.*
More information about the pkg-vdr-dvb-changes
mailing list