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

[Thomas Schmidt]

Author: tschmidt
Date: 2006-01-21 11:16:05 +0000 (Sat, 21 Jan 2006)
New Revision: 1767

Removed:
   vdr/vdr-plugin-statusleds/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   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
Log:
vdr-plugin-statusleds: New upstream release 0.3

Modified: vdr/vdr-plugin-statusleds/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/changelog	2006-01-21 11:11:54 UTC (rev 1766)
+++ vdr/vdr-plugin-statusleds/trunk/debian/changelog	2006-01-21 11:16:05 UTC (rev 1767)
@@ -1,8 +1,17 @@
-vdr-plugin-statusleds (0.2-16) unstable; urgency=low
+vdr-plugin-statusleds (0.3-1) unstable; urgency=low
 
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
+    - New upstream release
+      + Removed 01_Makefile-fPIC-fix.dpatch
+      + Removed 91_statusleds-0.2-1.3.38.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sat, 21 Jan 2006 12:13:02 +0100
+
+vdr-plugin-statusleds (0.2-16) unstable; urgency=low
+
+  * 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

Modified: vdr/vdr-plugin-statusleds/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/patches/00list	2006-01-21 11:11:54 UTC (rev 1766)
+++ vdr/vdr-plugin-statusleds/trunk/debian/patches/00list	2006-01-21 11:16:05 UTC (rev 1767)
@@ -1,3 +1 @@
-01_Makefile-fPIC-fix
 02_Makefile-GNU_SOURCE-fix
-91_statusleds-0.2-1.3.38

Deleted: vdr/vdr-plugin-statusleds/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-statusleds/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-01-21 11:11:54 UTC (rev 1766)
+++ vdr/vdr-plugin-statusleds/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-01-21 11:16:05 UTC (rev 1767)
@@ -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-solitaire/Makefile vdrdevel-plugin-solitaire/Makefile
---- /usr/src/cvs/vdrdevel-plugin-solitaire/Makefile	Fri Aug 27 18:07:06 2004
-+++ vdrdevel-plugin-solitaire/Makefile	Sat Sep 18 18:30:11 2004
-@@ -16,7 +16,7 @@
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 

Deleted: 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-21 11:11:54 UTC (rev 1766)
+++ vdr/vdr-plugin-statusleds/trunk/debian/patches/91_statusleds-0.2-1.3.38.dpatch	2006-01-21 11:16:05 UTC (rev 1767)
@@ -1,38 +0,0 @@
-#! /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--;