r2822 - in vdr/vdr-plugin-reelchannelscan/trunk: . debian
debian/patches
Thomas Günther
tom-guest at costa.debian.org
Sun Jun 4 20:43:07 UTC 2006
Author: tom-guest
Date: 2006-06-04 20:43:07 +0000 (Sun, 04 Jun 2006)
New Revision: 2822
Added:
vdr/vdr-plugin-reelchannelscan/trunk/debian/
vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
vdr/vdr-plugin-reelchannelscan/trunk/debian/compat
vdr/vdr-plugin-reelchannelscan/trunk/debian/control
vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright
vdr/vdr-plugin-reelchannelscan/trunk/debian/docs
vdr/vdr-plugin-reelchannelscan/trunk/debian/install
vdr/vdr-plugin-reelchannelscan/trunk/debian/links
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/03_Force_long_dvbt_scan.dpatch
vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/04_reelchannelscan-0.3.0-configdir.dpatch
vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
Log:
Load newtrunk into vdr/vdr-plugin-reelchannelscan/trunk.
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,11 @@
+vdr-plugin-reelchannelscan (0.3.0-1) unstable; urgency=low
+
+ * Klaus Deiss <kdeiss at web.de>
+ - Added patch for dvb-t scan
+ - Upstream Rel. 0.3.0
+ * Thomas Günther <tom at toms-cafe.de>
+ - Removed 02_fix-includes.dpatch
+ - Moved transponders directory to /var/lib/vdr/plugins/reelchannelscan/
+ to fix conflict with vdr-plugin-channelscan
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 4 Jun 2006 22:26:31 +0200
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/compat 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/compat 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1 @@
+4
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/control 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/control 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,15 @@
+Source: vdr-plugin-reelchannelscan
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
+Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.4.0-1), dpatch
+Standards-Version: 3.6.2
+
+Package: vdr-plugin-reelchannelscan
+Architecture: any
+Depends: ${shlibs:Depends}, ${vdr:Depends}
+Description: Channelscan for VDR
+ This plugin allows you to scan for new channel. It supports also scans for
+ dvb-t and dvb-c.
+XB-VDR-Patchlevel: ${vdr:Patchlevel}
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,21 @@
+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 Author(s):
+ movimax <mhahn at reel-multimedia.com>
+ Klaus Heppenheimer <klaus at reel-multimedia.com>
+ based on channelscan-0.0.4b by kikko77 <kikko77 at altervista.org>
+
+Project's homepage: http://www.reel-multimedia.com
+
+To contact the authors please use the vdr development mailing list or our forum at
+ http://www.reel-multimedia.com/forum/board.php?boardid=182
+
+See the file COPYING for license information.
+
+Copyright:
+
+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 .
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/docs 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/docs 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1 @@
+README
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/install 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/install 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,2 @@
+libvdr-reelchannelscan.so.* usr/lib/vdr/plugins/
+transponders/*.tpl usr/share/vdr-plugin-reelchannelscan/transponders/
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/links
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/links 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/links 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1 @@
+usr/share/vdr-plugin-reelchannelscan/transponders var/lib/vdr/plugins/reelchannelscan/transponders
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,3 @@
+01_Makefile-fPIC-fix
+03_Force_long_dvbt_scan
+04_reelchannelscan-0.3.0-configdir
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## Makefile-fPIC-fix patch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
+
+ at DPATCH@
+diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile
+--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile Sun May 16 15:48:12 2004
++++ vdrdevel-plugin-rotor/Makefile Sat Sep 11 00:28:18 2004
+@@ -18,7 +18,7 @@
+ ### The C++ compiler and options:
+
+ CXX ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+
+ ### The directory environment:
+
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/03_Force_long_dvbt_scan.dpatch
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/03_Force_long_dvbt_scan.dpatch 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/03_Force_long_dvbt_scan.dpatch 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,69 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Force waiting after switching to a new dvb-t bouquet. Better results for dvb-t.
+## DP: Slowing down the scan process significant Klaus Deiss <kdeiss at web.de>
+
+ at DPATCH@
+--- /usr/src/vdr/vdr-1.4.0/PLUGINS/src/vdr-plugin-reelchannelscan/upstream/reelchannelscan-0.3.0/scan.c 2006-04-04 21:18:04.000000000 +0200
++++ vdr-plugin-reelchannelscan/scan.c 2006-05-21 09:24:12.000000000 +0200
+@@ -88,6 +88,14 @@
+ dsyslog(DBG " switch channel ");
+ if (!device->SwitchChannel(c,true))
+ esyslog(ERR "SwitchChannel(c) failed");
++
++ if(cSource::IsTerr(sourceCode))
++ {
++ esyslog(DBG "DVB-T Source - waiting for lock 5 seconds ....");
++ sleep(5);
++ esyslog(DBG "CONTINUE");
++ }
++
+
+ if (cDevice::GetDevice(cardnr)->HasLock(transponders.LockMs()))
+ {
+@@ -109,7 +117,32 @@
+ SFilter = NULL;
+ }
+ else
+- dsyslog(DBG " !!!! NO LOCK ------------- ");
++ {
++ dsyslog(DBG " !!!! NO LOCK ------------- ");
++ if(cSource::IsTerr(sourceCode))
++ {
++ esyslog(DBG "DVB-T Source - proceeding without lock ....");
++ PFilter = new PatFilter();
++ SFilter = new SdtFilter(PFilter);
++ PFilter->SetSdtFilter(SFilter);
++ device->AttachFilter(SFilter);
++ device->AttachFilter(PFilter);
++
++ time_t start=time(NULL);
++
++ while(!PFilter->EndOfScan() && time(NULL) - start < SCAN_DELAY && cMenuChannelscan::scanning)
++ usleep(20);
++
++ device->Detach(PFilter);
++ device->Detach(SFilter);
++ PFilter = NULL;
++ SFilter = NULL;
++
++ esyslog(DBG "Scan without lock done");
++ }
++ }
++
++
+
+ } // Scanning loop
+
+--- /usr/src/vdr/vdr-1.4.0/PLUGINS/src/vdr-plugin-reelchannelscan/upstream/reelchannelscan-0.3.0/transponders.c 2006-04-04 21:18:04.000000000 +0200
++++ vdr-plugin-reelchannelscan/transponders.c 2006-05-21 09:24:12.000000000 +0200
+@@ -328,7 +328,7 @@
+ Clear();
+ int f;
+ int channel=0;
+- lockMs_ = 3000;
++ lockMs_ = 5000;
+
+
+ //for (channel=5; channel <= 12; channel++)
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/04_reelchannelscan-0.3.0-configdir.dpatch
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/04_reelchannelscan-0.3.0-configdir.dpatch 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/04_reelchannelscan-0.3.0-configdir.dpatch 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_reelchannelscan-0.3.0-configdir.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use plugins own config directory.
+
+ at DPATCH@
+--- reelchannelscan-0.3.0/transponders.c
++++ reelchannelscan-0.3.0/transponders.c
+@@ -369,7 +369,7 @@
+
+ string cTransponders::TplFileName(int satCodec)
+ {
+- string tmp = cPlugin::ConfigDirectory();
++ string tmp = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
+ // TODO remove /plugins/ from tmp
+ tmp += "/transponders/";
+ char *buffer;
Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/rules 2006-06-04 20:42:41 UTC (rev 2821)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/rules 2006-06-04 20:43:07 UTC (rev 2822)
@@ -0,0 +1,98 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# Set VDR=vdr or VDR=vdrdevel - vdrdevel always uses dpatch
+VDR=$(shell dh_listpackages | grep "^vdr.*-" | head -n 1 | sed -e "s/-.*//")
+ifeq ($(VDR), vdrdevel)
+ DPATCH=yes
+endif
+
+# To use dpatch uncomment the following line and set Build-Depends to dpatch
+DPATCH=yes
+
+ifdef DPATCH
+include /usr/share/dpatch/dpatch.make
+else
+patch:
+patch-stamp:
+unpatch:
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
+ INCLUDES=-I/usr/include/$(VDR)
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ -$(MAKE) -o .dependencies clean
+ rm -f libvdr-*.so.*
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ dh_install
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+# dh_installmenu
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installman
+# dh_installinfo
+# dh_undocumented
+ dh_installchangelogs HISTORY
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ /usr/lib/$(VDR)-dev/patchlevel.sh subst
+ /usr/lib/$(VDR)-dev/dependencies.sh
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure \
+ clean-patched patch unpatch
Property changes on: vdr/vdr-plugin-reelchannelscan/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-vdr-dvb-changes
mailing list