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

Fri May 4 18:15:45 UTC 2007

Author: tiber-guest
Date: 2007-05-04 18:15:44 +0000 (Fri, 04 May 2007)
New Revision: 4531

Added:
   vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/02_scanning_status_service.dpatch
Removed:
   vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_service-bugfix.dpatch
Modified:
   vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
   vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
   vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_dont-force-32bit.dpatch
   vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/04_reelchannelscan-0.3.0-configdir.dpatch
Log:
* (NOT RELEASED YET)
* New upstream release
* Updated 01_dont-force-32bit.dpatch
* Updated 04_reelchannelscan-0.3.0-configdir.dpatch
* Removed 90_service-bugfix.dpatch (fixed upstream)
* Added 02_scanning_status_service.dpatch (to avoid the use of a vdr patch,
  that exposes a global variable to the plugin, which would break the
  API compatibility)

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog
===================================================================

--- vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2007-05-04 00:00:40 UTC (rev 4530)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/changelog	2007-05-04 18:15:44 UTC (rev 4531)
@@ -1,3 +1,16 @@
+vdr-plugin-reelchannelscan (0.4.3~r2-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET)
+  * New upstream release
+  * Updated 01_dont-force-32bit.dpatch
+  * Updated 04_reelchannelscan-0.3.0-configdir.dpatch
+  * Removed 90_service-bugfix.dpatch (fixed upstream)
+  * Added 02_scanning_status_service.dpatch (to avoid the use of a vdr patch,
+    that exposes a global variable to the plugin, which would break the
+    API compatibility)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri,  4 May 2007 19:50:35 +0200
+
 vdr-plugin-reelchannelscan (0.4.0-6) experimental; urgency=low
 
   * Release for vdrdevel 1.5.2

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list	2007-05-04 00:00:40 UTC (rev 4530)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/00list	2007-05-04 18:15:44 UTC (rev 4531)
@@ -1,3 +1,3 @@
 01_dont-force-32bit
+02_scanning_status_service
 04_reelchannelscan-0.3.0-configdir
-90_service-bugfix

Modified: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_dont-force-32bit.dpatch
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_dont-force-32bit.dpatch	2007-05-04 00:00:40 UTC (rev 4530)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/01_dont-force-32bit.dpatch	2007-05-04 18:15:44 UTC (rev 4531)
@@ -5,14 +5,14 @@
 ## DP: Don't force package to compile only for 32 bit.
 
 @DPATCH@
-diff -urNad vdr-plugin-reelchannelscan-0.4.0~/Makefile vdr-plugin-reelchannelscan-0.4.0/Makefile
---- vdr-plugin-reelchannelscan-0.4.0~/Makefile	2006-11-04 16:33:55.000000000 +0100
-+++ vdr-plugin-reelchannelscan-0.4.0/Makefile	2007-03-18 21:36:15.000000000 +0100
-@@ -24,7 +24,7 @@
+diff -urNad vdr-plugin-reelchannelscan-0.4.3~r2~/Makefile vdr-plugin-reelchannelscan-0.4.3~r2/Makefile
+--- vdr-plugin-reelchannelscan-0.4.3~r2~/Makefile	2007-05-04 19:19:45.000000000 +0200
++++ vdr-plugin-reelchannelscan-0.4.3~r2/Makefile	2007-05-04 20:02:19.000000000 +0200
+@@ -18,7 +18,7 @@
  ### The C++ compiler and options:
  
  CXX      ?= g++
--CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -m32
+-CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -m32 
 +CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
  
  ### The directory environment:

Added: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/02_scanning_status_service.dpatch
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/02_scanning_status_service.dpatch	2007-05-04 00:00:40 UTC (rev 4530)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/02_scanning_status_service.dpatch	2007-05-04 18:15:44 UTC (rev 4531)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_scanning_status_service.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch adds the service ReelChannelscan::IsScanningOnReceivingDevice
+## DP: that is used by a VDR patch instead of exposiing a global variable in
+## DP: VDR.
+
+ at DPATCH@
+diff -urNad channelscan-0.4.3~/channelscan.c channelscan-0.4.3/channelscan.c
+--- channelscan-0.4.3~/channelscan.c	2007-03-25 16:50:11.000000000 +0200
++++ channelscan-0.4.3/channelscan.c	2007-03-25 16:50:28.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "service.h"
+ #include "csmenu.h"
+ #include "channelscan.h"
++#include "evil_globals.h"
+ 
+ int oldChannelNumbers = 0; //XXX
+ 
+@@ -146,6 +147,13 @@
+      }
+      return true;
+   }
++
++  if (Id && strcmp(Id,"ReelChannelscan::IsScanningOnReceivingDevice")==0)
++  {
++     *(bool*)Data = scanning_on_receiving_device;
++     return true;
++  }
++
+   return false;
+ }
+ 
+diff -urNad channelscan-0.4.3~/csmenu.c channelscan-0.4.3/csmenu.c
+--- channelscan-0.4.3~/csmenu.c	2007-03-25 16:50:11.000000000 +0200
++++ channelscan-0.4.3/csmenu.c	2007-03-25 16:50:16.000000000 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include "csmenu.h"
+ #include "filter.h"
++#include "evil_globals.h"
+ 
+ 
+ #define CHNUMWIDTH 16
+diff -urNad channelscan-0.4.3~/evil_globals.h channelscan-0.4.3/evil_globals.h
+--- channelscan-0.4.3~/evil_globals.h	1970-01-01 01:00:00.000000000 +0100
++++ channelscan-0.4.3/evil_globals.h	2007-03-25 16:50:16.000000000 +0200
+@@ -0,0 +1,6 @@
++#ifndef __EVIL_GLOBALS_H
++#define __EVIL_GLOBALS_H
++
++extern bool scanning_on_receiving_device;
++
++#endif
+diff -urNad channelscan-0.4.3~/scan.c channelscan-0.4.3/scan.c
+--- channelscan-0.4.3~/scan.c	2007-03-25 16:50:11.000000000 +0200
++++ channelscan-0.4.3/scan.c	2007-03-25 16:50:16.000000000 +0200
+@@ -17,6 +17,7 @@
+ #include "scan.h"
+ #include <stdio.h>
+ #include "debug.h"
++#include "evil_globals.h"
+ 
+ #define SCAN_DELAY 20
+ #define DVBS_LOCK_TIMEOUT 4000

Modified: 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	2007-05-04 00:00:40 UTC (rev 4530)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/04_reelchannelscan-0.3.0-configdir.dpatch	2007-05-04 18:15:44 UTC (rev 4531)
@@ -5,14 +5,15 @@
 ## DP: Use plugins own config directory.
 
 @DPATCH@
---- reelchannelscan-0.3.0/transponders.c
-+++ reelchannelscan-0.3.0/transponders.c
-@@ -369,7 +369,7 @@
-
+diff -urNad vdr-plugin-reelchannelscan-0.4.3~r2~/transponders.c vdr-plugin-reelchannelscan-0.4.3~r2/transponders.c
+--- vdr-plugin-reelchannelscan-0.4.3~r2~/transponders.c	2007-05-04 19:19:45.000000000 +0200
++++ vdr-plugin-reelchannelscan-0.4.3~r2/transponders.c	2007-05-04 20:04:04.000000000 +0200
+@@ -536,7 +536,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;
+   if (satCodec == 0)
+   {

Deleted: vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_service-bugfix.dpatch
===================================================================
--- vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_service-bugfix.dpatch	2007-05-04 00:00:40 UTC (rev 4530)
+++ vdr/vdr-plugin-reelchannelscan/trunk/debian/patches/90_service-bugfix.dpatch	2007-05-04 18:15:44 UTC (rev 4531)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_service-bugfix.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes a bug in cPluginChannelscan::Service()
-
- at DPATCH@
-diff -urNad vdr-plugin-reelchannelscan-0.4.0~/channelscan.c vdr-plugin-reelchannelscan-0.4.0/channelscan.c
---- vdr-plugin-reelchannelscan-0.4.0~/channelscan.c	2006-11-04 16:25:09.000000000 +0100
-+++ vdr-plugin-reelchannelscan-0.4.0/channelscan.c	2007-03-12 19:41:28.000000000 +0100
-@@ -131,8 +131,9 @@
-         esyslog ("channelscan: wrong Service Data: \"%s\" ", static_cast<const char *>(Data)); 
-         AutoScanStat = AssNone;
-      }
-+     return true;
-   }
--  return true;
-+  return false;
- }
- 
- bool cPluginChannelscan::SetupParse(const char *Name, const char *Value) {


