r4910 - in /vdr/vdr-plugin-wirbelscan/trunk/debian: changelog control patches/ patches/00list patches/90_wirbelscan-0.0.2-1.5.1.dpatch rules
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Wed Jun 27 23:51:00 UTC 2007
Author: tom-guest
Date: Wed Jun 27 23:50:59 2007
New Revision: 4910
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4910
Log:
Release for vdrdevel 1.5.5
Added:
vdr/vdr-plugin-wirbelscan/trunk/debian/patches/
vdr/vdr-plugin-wirbelscan/trunk/debian/patches/00list
vdr/vdr-plugin-wirbelscan/trunk/debian/patches/90_wirbelscan-0.0.2-1.5.1.dpatch
Modified:
vdr/vdr-plugin-wirbelscan/trunk/debian/changelog
vdr/vdr-plugin-wirbelscan/trunk/debian/control
vdr/vdr-plugin-wirbelscan/trunk/debian/rules
Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/changelog?rev=4910&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/changelog Wed Jun 27 23:50:59 2007
@@ -1,3 +1,11 @@
+vdr-plugin-wirbelscan (0.0.2-3) unstable; urgency=low
+
+ * Release for vdrdevel 1.5.5
+ * Added 90_wirbelscan-0.0.2-1.5.1.dpatch
+ * Added XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control
+
+ -- Thomas Günther <tom at toms-cafe.de> Thu, 28 Jun 2007 00:41:17 +0200
+
vdr-plugin-wirbelscan (0.0.2-2) unstable; urgency=low
* Added copyright year and full GPL license header to debian/copyright
Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/control?rev=4910&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/control (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/control Wed Jun 27 23:50:59 2007
@@ -3,8 +3,10 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.6-2)
+Build-Depends: debhelper (>= 5), vdr-dev (>= 1.4.6-2), dpatch
Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/
Package: vdr-plugin-wirbelscan
Architecture: any
Added: vdr/vdr-plugin-wirbelscan/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/patches/00list?rev=4910&op=file
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/patches/00list Wed Jun 27 23:50:59 2007
@@ -1,0 +1,1 @@
+90_wirbelscan-0.0.2-1.5.1
Added: vdr/vdr-plugin-wirbelscan/trunk/debian/patches/90_wirbelscan-0.0.2-1.5.1.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/patches/90_wirbelscan-0.0.2-1.5.1.dpatch?rev=4910&op=file
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/patches/90_wirbelscan-0.0.2-1.5.1.dpatch (added)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/patches/90_wirbelscan-0.0.2-1.5.1.dpatch Wed Jun 27 23:50:59 2007
@@ -1,0 +1,152 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90_wirbelscan-0.0.2-1.5.1.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.1.
+
+ at DPATCH@
+--- wirbelscan-0.0.2/menusetup.c
++++ wirbelscan-0.0.2/menusetup.c
+@@ -11,6 +11,9 @@
+ #include <vdr/menuitems.h>
+ #include <vdr/device.h>
+ #include <vdr/config.h>
++#if APIVERSNUM >= 10501
++#include <vdr/shutdown.h>
++#endif
+ #include "menusetup.h"
+ #include "common.h"
+ #include "frequencies.h"
+@@ -70,19 +73,19 @@
+ void CleanUp(void) {
+ if (CableScanning && CableScanner) {
+ d(0, "Stopping cable scanner.");
+- CableScanner->EmergencyExit();
++ //CableScanner->EmergencyExit();
+ }
+ if (TerrScanning && TerrScanner) {
+ d(0, "Stopping terr scanner.");
+- TerrScanner->EmergencyExit();
++ //TerrScanner->EmergencyExit();
+ }
+ if (AnalogScanning && AnalogScanner) {
+ d(0, "Stopping analog scanner.");
+- AnalogScanner->EmergencyExit();
++ //AnalogScanner->EmergencyExit();
+ }
+ if (SatScanning && SatScanner) {
+ d(0, "Stopping sat scanner.");
+- SatScanner->EmergencyExit();
++ //SatScanner->EmergencyExit();
+ }
+ }
+
+@@ -322,7 +325,11 @@
+ }
+
+ bool cUpdateThread::ActionAllowed(void) {
++#if APIVERSNUM >= 10501
++ return (Running() && !ShutdownHandler.EmergencyExitRequested() && !shouldstop);
++#else
+ return (Running() && !EmergencyExit(false) && !shouldstop);
++#endif
+ }
+
+ void cUpdateThread::Action(void) {
+--- wirbelscan-0.0.2/scanner.c
++++ wirbelscan-0.0.2/scanner.c
+@@ -13,6 +13,9 @@
+ #include <vdr/sources.h>
+ #include <vdr/eitscan.h>
+ #include <vdr/channels.h>
++#if APIVERSNUM >= 10501
++#include <vdr/shutdown.h>
++#endif
+ #include "scanner.h"
+ #include "menusetup.h"
+ #include "common.h"
+@@ -153,13 +156,21 @@ cTerrScanner::~cTerrScanner(void) {
+ SetShouldstop(true);
+ if (Active()) {
+ *isLiving=0;
++#if APIVERSNUM >= 10501
++ ShutdownHandler.RequestEmergencyExit();
++#else
+ EmergencyExit(true);
++#endif
+ }
+ d(3, "leaving ~cTerrScanner()");
+ }
+
+ bool cTerrScanner::ActionAllowed(void) {
++#if APIVERSNUM >= 10501
++ return (Running() && !ShutdownHandler.EmergencyExitRequested() && !shouldstop);
++#else
+ return (Running() && !EmergencyExit(false) && !shouldstop);
++#endif
+ }
+
+ bool cTerrScanner::CheckTransponder(int freq, int inv, int bw, int mod, int tm, int ch, int cl, int h,\
+@@ -414,12 +425,20 @@ cCableScanner::~cCableScanner(void) {
+ SetShouldstop(true);
+ if (Active()) {
+ *isLiving=0;
++#if APIVERSNUM >= 10501
++ ShutdownHandler.RequestEmergencyExit();
++#else
+ EmergencyExit(true);
++#endif
+ }
+ }
+
+ bool cCableScanner::ActionAllowed(void) {
++#if APIVERSNUM >= 10501
++ return (Running() && !ShutdownHandler.EmergencyExitRequested() && !shouldstop);
++#else
+ return (Running() && !EmergencyExit(false) && !shouldstop);
++#endif
+ }
+
+ bool cCableScanner::CheckTransponder(int frequency, int srate, int mod, int coderateh, int maxtunetrials, int maxlocktrials) {
+@@ -627,12 +646,20 @@ cSatScanner::~cSatScanner(void) {
+ SetShouldstop(true);
+ if (Active()) {
+ *isLiving=0;
++#if APIVERSNUM >= 10501
++ ShutdownHandler.RequestEmergencyExit();
++#else
+ EmergencyExit(true);
++#endif
+ }
+ }
+
+ bool cSatScanner::ActionAllowed(void) {
++#if APIVERSNUM >= 10501
++ return (Running() && !ShutdownHandler.EmergencyExitRequested() && !shouldstop);
++#else
+ return (Running() && !EmergencyExit(false) && !shouldstop);
++#endif
+ }
+
+ void cSatScanner::SetTransponderData(void) {
+@@ -774,12 +801,20 @@ cAnalogScanner::~cAnalogScanner(void) {
+ SetShouldstop(true);
+ if (Active()) {
+ *isLiving=0;
++#if APIVERSNUM >= 10501
++ ShutdownHandler.RequestEmergencyExit();
++#else
+ EmergencyExit(true);
++#endif
+ }
+ }
+
+ bool cAnalogScanner::ActionAllowed(void) {
++#if APIVERSNUM >= 10501
++ return (Running() && !ShutdownHandler.EmergencyExitRequested() && !shouldstop);
++#else
+ return (Running() && !EmergencyExit(false) && !shouldstop);
++#endif
+ }
+
+ bool cAnalogScanner::IsPvr(int dev) {
Modified: vdr/vdr-plugin-wirbelscan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-wirbelscan/trunk/debian/rules?rev=4910&op=diff
==============================================================================
--- vdr/vdr-plugin-wirbelscan/trunk/debian/rules (original)
+++ vdr/vdr-plugin-wirbelscan/trunk/debian/rules Wed Jun 27 23:50:59 2007
@@ -13,7 +13,7 @@
endif
# To use dpatch uncomment the following line and set Build-Depends to dpatch
-# DPATCH=yes
+DPATCH=yes
ifdef DPATCH
include /usr/share/dpatch/dpatch.make
More information about the pkg-vdr-dvb-changes
mailing list