r4389 - in vdr/vdr-plugin-softdevice/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2007-04-12 20:43:05 +0000 (Thu, 12 Apr 2007)
New Revision: 4389

Removed:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/TODO
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/control
   vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
Log:
* New upstream release
* Dropped 91_softdevice-0.3.1-1.5.0.dpatch - fixed upstream
* Build-Depend on libxinerama-dev to enable Xinerama support (This will not
  compile on Sarge anymore!)

Modified: vdr/vdr-plugin-softdevice/trunk/debian/TODO
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/TODO	2007-03-31 18:58:57 UTC (rev 4388)
+++ vdr/vdr-plugin-softdevice/trunk/debian/TODO	2007-04-12 20:43:05 UTC (rev 4389)
@@ -2,5 +2,3 @@
 
 - Manpage for ShmClient
 - Use sublugins to split depenencies on framebuffer and xv
-- Dependencies for Sid/Etch not available in Sarge:
-  libxinerama-dev, x11proto-core-dev, x11proto-xext-dev, x11proto-xinerama-dev

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2007-03-31 18:58:57 UTC (rev 4388)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2007-04-12 20:43:05 UTC (rev 4389)
@@ -1,3 +1,12 @@
+vdr-plugin-softdevice (0.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Dropped 91_softdevice-0.3.1-1.5.0.dpatch - fixed upstream
+  * Build-Depend on libxinerama-dev to enable Xinerama support (This will not
+    compile on Sarge anymore!)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Thu, 12 Apr 2007 22:42:36 +0200
+
 vdr-plugin-softdevice (0.3.1-4) experimental; urgency=low
 
   * Release for vdrdevel 1.5.1

Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control	2007-03-31 18:58:57 UTC (rev 4388)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control	2007-04-12 20:43:05 UTC (rev 4389)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Nicolas Huillard <nicolas at huillard.net>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev, libxext-dev, zlib1g-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev, libxext-dev, zlib1g-dev, libxinerama-dev
 Standards-Version: 3.7.2
 
 Package: vdr-plugin-softdevice

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2007-03-31 18:58:57 UTC (rev 4388)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2007-04-12 20:43:05 UTC (rev 4389)
@@ -1,3 +1,2 @@
 04_debian_ffmpeg
 06_dfb++
-91_softdevice-0.3.1-1.5.0

Deleted: vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch	2007-03-31 18:58:57 UTC (rev 4388)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/91_softdevice-0.3.1-1.5.0.dpatch	2007-04-12 20:43:05 UTC (rev 4389)
@@ -1,74 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_softdevice-0.3.1-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@
---- softdevice-0.3.1/setup-softdevice.c
-+++ softdevice-0.3.1/setup-softdevice.c
-@@ -416,13 +416,13 @@
- 
- /* ---------------------------------------------------------------------------
-  */
--bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64 key)
-+bool cSetupStore::CatchRemoteKey(const char *remoteName, uint64_t key)
- {
- #ifndef STAND_ALONE
-     char  buffer[32];
-     eKeys keySym;
- 
--  snprintf(buffer, sizeof(buffer), "%016LX", (uint64) key);
-+  snprintf(buffer, sizeof(buffer), "%016LX", (uint64_t) key);
-   keySym = Keys.Get(remoteName, buffer);
-   if (keySym >= kUser1 && keySym <= kUser9)
-   {
---- softdevice-0.3.1/setup-softdevice.h
-+++ softdevice-0.3.1/setup-softdevice.h
-@@ -121,7 +121,7 @@
-     char          *getPPValue(void);
-     void          CropModeNext(void);
- 
--    virtual bool  CatchRemoteKey(const char *remoteName, uint64 key);
-+    virtual bool  CatchRemoteKey(const char *remoteName, uint64_t key);
- 
-     int   xvAspect;
-     int   xvMaxArea;
---- softdevice-0.3.1/ShmClient.c
-+++ softdevice-0.3.1/ShmClient.c
-@@ -41,11 +41,11 @@
-                 ~cShmRemote()
-                 {};
- 
--                virtual bool PutKey(uint64 Code, bool Repeat = false,
-+                virtual bool PutKey(uint64_t Code, bool Repeat = false,
-                                 bool Release = false);
- };
- 
--bool cShmRemote::PutKey(uint64 Code, bool Repeat,
-+bool cShmRemote::PutKey(uint64_t Code, bool Repeat,
-                                 bool Release) {
-         if (ctl)
-         {
---- softdevice-0.3.1/VdrReplacements.h
-+++ softdevice-0.3.1/VdrReplacements.h
-@@ -30,7 +30,7 @@
- 
- #define tr(out) out
- 
--typedef unsigned long long int uint64;
-+typedef unsigned long long int uint64_t;
- typedef int eKeys;
- 
- class cSoftRemote {
---- softdevice-0.3.1/video.h
-+++ softdevice-0.3.1/video.h
-@@ -60,7 +60,7 @@
-   public:
-           cSoftRemote(const char *Name) : cRemote(Name) {};
-           virtual ~cSoftRemote() {};
--          virtual bool PutKey(uint64 Code, bool Repeat = false,
-+          virtual bool PutKey(uint64_t Code, bool Repeat = false,
-                           bool Release = false)
-           { return Put(Code,Repeat,Release); };
- };