r3119 - in vdr/vdr-plugin-reelchannelscan/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-07-23 14:17:55 +0000 (Sun, 23 Jul 2006)
New Revision: 3119

Removed:
   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
Modified:
   vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
   vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright
   vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
Log:
New upstream release 0.3.3

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2006-07-23 13:34:51 UTC (rev 3118)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2006-07-23 14:17:55 UTC (rev 3119)
@@ -1,3 +1,13 @@
+vdr-plugin-reelchannelscan (0.3.3-1) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+  * New upstream release
+  * Removed 01_Makefile-fPIC-fix.dpatch
+  * Removed 03_Force_long_dvbt_scan.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de>  Sun, 23 Jul 2006 15:32:59 +0200
+
 vdr-plugin-reelchannelscan (0.3.0-2) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright	2006-07-23 13:34:51 UTC (rev 3118)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/copyright	2006-07-23 14:17:55 UTC (rev 3119)
@@ -22,8 +22,13 @@
 http://www.reel-multimedia.com/forum/board.php?boardid=182
 
 
-See the file COPYING for license information.
+Debian Maintainers:
 
+  Klaus Deiss <kdeiss at web.de>
+  Tobias Grimm <tg at e-tobi.net>
+  Thomas Günther <tom at toms-cafe.de>
+  Thomas Schmidt <tschmidt at debian.org>
+
 Copyright:
 
 It may be redistributed under the terms of the GNU GPL, Version 2

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list	2006-07-23 13:34:51 UTC (rev 3118)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list	2006-07-23 14:17:55 UTC (rev 3119)
@@ -1,3 +1 @@
-01_Makefile-fPIC-fix
-03_Force_long_dvbt_scan
 04_reelchannelscan-0.3.0-configdir

Deleted: 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-07-23 13:34:51 UTC (rev 3118)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-07-23 14:17:55 UTC (rev 3119)
@@ -1,20 +0,0 @@
-#!/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:
- 

Deleted: 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-07-23 13:34:51 UTC (rev 3118)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/03_Force_long_dvbt_scan.dpatch	2006-07-23 14:17:55 UTC (rev 3119)
@@ -1,69 +0,0 @@
-#!/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++)