[SCM] vdr-plugin-ffnetdev packaging repository branch, master, updated. debian/0.1.0+svn20071201.1427-10-6-gb99bfff

[etobi]

The following commit has been merged in the master branch:
commit b99bfff4a17328e7549eebc83d5bdd4d5e7362c6
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 25 17:01:46 2012 +0200

    Updated patches

diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index e243261..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_Makefile-fPIC-fix
-91_ffnetdev-0.1.0+svn20060625-1.5.0
-92_vdr-1.5.12-ffnetdev-svn20071122
-93_gcc43
diff --git a/debian/patches/01_Makefile-fPIC-fix.dpatch b/debian/patches/01_Makefile-fPIC-fix.patch
similarity index 100%
rename from debian/patches/01_Makefile-fPIC-fix.dpatch
rename to debian/patches/01_Makefile-fPIC-fix.patch
diff --git a/debian/patches/91_ffnetdev-0.1.0+svn20060625-1.5.0.dpatch b/debian/patches/91_ffnetdev-0.1.0+svn20060625-1.5.0.dpatch
deleted file mode 100644
index 7fa44d9..0000000
--- a/debian/patches/91_ffnetdev-0.1.0+svn20060625-1.5.0.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_ffnetdev-0.1.0+svn20060625-1.5.0.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.0 (applicable to VDR >= 1.4.5).
-
- at DPATCH@
---- ffnetdev-0.1.0+svn20060625/remote.c
-+++ ffnetdev-0.1.0+svn20060625/remote.c
-@@ -27,7 +27,7 @@
- 	return true;
- }
- 
--bool cMyRemote::Put(uint64 Code, bool Repeat, bool Release)
-+bool cMyRemote::Put(uint64_t Code, bool Repeat, bool Release)
- {
- #if VDRVERSNUM >= 10347
-     if ((cRemote::IsLearning()) && (Release))
---- ffnetdev-0.1.0+svn20060625/remote.h
-+++ ffnetdev-0.1.0+svn20060625/remote.h
-@@ -17,7 +17,7 @@
-   cMyRemote(const char *Name);
-   virtual bool Initialize(void);
-   virtual bool Ready(void);
--  virtual bool Put(uint64 Code, bool Repeat, bool Release);
-+  virtual bool Put(uint64_t Code, bool Repeat, bool Release);
- };
- 
- 
diff --git a/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch b/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch
deleted file mode 100644
index 5296cdc..0000000
--- a/debian/patches/92_vdr-1.5.12-ffnetdev-svn20071122.dpatch
+++ /dev/null
@@ -1,75 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 92_vdr-1.5.12-ffnetdev-svn20071122.dpatch by free-x at vdrportal.de
-## http://vdrportal.de/board/thread.php?postid=672306#post672306
-##
-## Thomas Günther <tom at toms-cafe.de>:
-##   - Added compatibility to VDR < 1.5.9
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.9.
-
- at DPATCH@
-diff -ur /home/oleg/plugins/ffnetdev/ffnetdev.c ffnetdev/ffnetdev.c
---- /home/oleg/plugins/ffnetdev/ffnetdev.c	2007-11-22 09:53:42.000000000 +0100
-+++ ffnetdev/ffnetdev.c	2007-11-22 10:10:58.000000000 +0100
-@@ -33,10 +33,18 @@
- 	
- }
- 
-+#if VDRVERSNUM >= 10509
-+cOsd * cNetOSDProvider::CreateOsd(int Left, int Top, uint Layer)
-+#else
- cOsd * cNetOSDProvider::CreateOsd(int Left, int Top)
-+#endif
- {
-     
-+#if VDRVERSNUM >= 10509
-+    osd = new cNetOSD(Left, Top, 0);
-+#else
-     osd = new cNetOSD(Left, Top);
-+#endif
-     return osd;
- }
- 
-diff -ur /home/oleg/plugins/ffnetdev/netosd.c ffnetdev/netosd.c
---- /home/oleg/plugins/ffnetdev/netosd.c	2007-11-22 09:53:42.000000000 +0100
-+++ ffnetdev/netosd.c	2007-11-22 10:08:14.000000000 +0100
-@@ -9,7 +9,11 @@
- #include "osdworker.h"
- 
- //////////////////////////////////////////////////////////////////////////////////////////////////
-+#if VDRVERSNUM >= 10509
-+cNetOSD::cNetOSD(int Left, int Top, uint Layer) : cOsd(Left, Top, Layer)
-+#else
- cNetOSD::cNetOSD(int Left, int Top) : cOsd(Left, Top)
-+#endif
- {
- #ifdef DEBUG   
-    fprintf(stderr,"[ffnetdev] NetOSD: Constructor cNetOSD.\n");
-diff -ur /home/oleg/plugins/ffnetdev/netosd.h ffnetdev/netosd.h
---- /home/oleg/plugins/ffnetdev/netosd.h	2007-11-22 09:53:42.000000000 +0100
-+++ ffnetdev/netosd.h	2007-11-22 10:10:00.000000000 +0100
-@@ -17,7 +17,11 @@
- 	bool truecolor;
- protected:
- public:
-+#if VDRVERSNUM >= 10509
-+    cNetOSD(int XOfs, int XOfs, uint Layer);
-+#else
-     cNetOSD(int XOfs, int XOfs);
-+#endif
-     virtual ~cNetOSD();
-     virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-     virtual void Flush(void);
-@@ -31,7 +35,11 @@
-     cNetOSD **NetOSD;
- public:
-     cNetOSDProvider(void);
-+#if VDRVERSNUM >= 10509
-+    virtual cOsd *CreateOsd(int Left, int Top, uint Layer);
-+#else
-     virtual cOsd *CreateOsd(int Left, int Top);
-+#endif
- };
- 
- #endif //_NETOSD__H
diff --git a/debian/patches/93_gcc43.dpatch b/debian/patches/93_gcc43.dpatch
deleted file mode 100644
index eafe009..0000000
--- a/debian/patches/93_gcc43.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 93_gcc43.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vdr-plugin-ffnetdev-0.1.0+svn20071201.1427~/netosd.h vdr-plugin-ffnetdev-0.1.0+svn20071201.1427/netosd.h
---- vdr-plugin-ffnetdev-0.1.0+svn20071201.1427~/netosd.h	2008-07-27 11:27:05.000000000 +0200
-+++ vdr-plugin-ffnetdev-0.1.0+svn20071201.1427/netosd.h	2008-07-27 11:27:30.000000000 +0200
-@@ -18,9 +18,9 @@
- protected:
- public:
- #if VDRVERSNUM >= 10509
--    cNetOSD(int XOfs, int XOfs, uint Layer);
-+    cNetOSD(int Left, int Top, uint Layer);
- #else
--    cNetOSD(int XOfs, int XOfs);
-+    cNetOSD(int Left, int Top);
- #endif
-     virtual ~cNetOSD();
-     virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..92c2804
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_Makefile-fPIC-fix.patch

-- 
vdr-plugin-ffnetdev packaging repository