r1764 - in vdr/vdr-plugin-statusleds/trunk/debian: . patches

[Thomas Günther]

Author: tom-guest
Date: 2006-01-20 00:18:28 +0000 (Fri, 20 Jan 2006)
New Revision: 1764

Added:
   vdr/vdr-plugin-statusleds/trunk/debian/compat
   vdr/vdr-plugin-statusleds/trunk/debian/patches/91_statusleds-0.2-1.3.38.dpatch
Modified:
   vdr/vdr-plugin-statusleds/trunk/debian/changelog
   vdr/vdr-plugin-statusleds/trunk/debian/patches/00list
   vdr/vdr-plugin-statusleds/trunk/debian/rules
   vdr/vdr-plugin-statusleds/trunk/debian/watch
Log:
Added 91_statusleds-0.2-1.3.38.dpatch

Modified: vdr/vdr-plugin-statusleds/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/changelog	2006-01-17 21:36:50 UTC (rev 1763)
+++ vdr/vdr-plugin-statusleds/trunk/debian/changelog	2006-01-20 00:18:28 UTC (rev 1764)
@@ -4,6 +4,11 @@
 
   * Thomas Schmidt <tschmidt at debian.org>
     - Build-Depend on vdr-dev (>=1.3.39-1)
+  * Thomas Günther <tom at toms-cafe.de>
+    - Added 91_statusleds-0.2-1.3.38.dpatch
+    - Updated debian/watch to use the php-script for sourceforge.net
+      projects on qa.debian.org
+    - Using debian/compat now
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue, 17 Jan 2006 22:29:05 +0100
 

Added: vdr/vdr-plugin-statusleds/trunk/debian/compat
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/compat	2006-01-17 21:36:50 UTC (rev 1763)
+++ vdr/vdr-plugin-statusleds/trunk/debian/compat	2006-01-20 00:18:28 UTC (rev 1764)
@@ -0,0 +1 @@
+4

Modified: vdr/vdr-plugin-statusleds/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/patches/00list	2006-01-17 21:36:50 UTC (rev 1763)
+++ vdr/vdr-plugin-statusleds/trunk/debian/patches/00list	2006-01-20 00:18:28 UTC (rev 1764)
@@ -1,2 +1,3 @@
 01_Makefile-fPIC-fix
 02_Makefile-GNU_SOURCE-fix
+91_statusleds-0.2-1.3.38

Added: vdr/vdr-plugin-statusleds/trunk/debian/patches/91_statusleds-0.2-1.3.38.dpatch
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/patches/91_statusleds-0.2-1.3.38.dpatch	2006-01-17 21:36:50 UTC (rev 1763)
+++ vdr/vdr-plugin-statusleds/trunk/debian/patches/91_statusleds-0.2-1.3.38.dpatch	2006-01-20 00:18:28 UTC (rev 1764)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91_statusleds-0.2-1.3.38.dpatch by Thomas Günther <tom at toms-cafe.de>
+## http://toms-cafe.de/vdr/download/statusleds-0.2-1.3.38.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.3.38.
+
+ at DPATCH@
+--- statusleds-0.2/statusleds.c
++++ statusleds-0.2/statusleds.c
+@@ -28,7 +28,11 @@
+ public:
+     cStatusUpdate();
+     ~cStatusUpdate();
++#if VDRVERSNUM >= 10338
++    virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On);
++#else
+     virtual void Recording(const cDevice *Device, const char *Name);
++#endif
+     void Stop();
+ protected:
+     virtual void Action(void);
+@@ -481,9 +485,15 @@
+   oStatusUpdate->Cancel((iOnDuration + iOnPauseDuration + iOffDuration) * 10);
+ }
+ 
++#if VDRVERSNUM >= 10338
++void cStatusUpdate::Recording(const cDevice *Device, const char *Name, const char *FileName, bool On)
++{
++  if (On)
++#else
+ void cStatusUpdate::Recording(const cDevice *Device, const char *Name)
+ {
+   if (Name)
++#endif
+     iRecordings++;
+   else
+     iRecordings--;

Modified: vdr/vdr-plugin-statusleds/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/rules	2006-01-17 21:36:50 UTC (rev 1763)
+++ vdr/vdr-plugin-statusleds/trunk/debian/rules	2006-01-20 00:18:28 UTC (rev 1764)
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif

Modified: vdr/vdr-plugin-statusleds/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/watch	2006-01-17 21:36:50 UTC (rev 1763)
+++ vdr/vdr-plugin-statusleds/trunk/debian/watch	2006-01-20 00:18:28 UTC (rev 1764)
@@ -1,2 +1,2 @@
-version=2
-http://osdn.dl.sourceforge.net/sourceforge/vdr-statusleds/vdr-statusleds-(.*)\.tgz
+version=3
+http://qa.debian.org/watch/sf.php/vdr-statusleds/ vdr-statusleds-(.*)\.tgz