r426 - in vdr/vdr-plugin-streamdev/trunk/debian: . patches

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 10 Apr 2005 13:04:07 +0000 

Author: tschmidt
Date: 2005-04-10 13:04:06 +0000 (Sun, 10 Apr 2005)
New Revision: 426

Added:
   vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr-1.3.23-fix.dpatch
Modified:
   vdr/vdr-plugin-streamdev/trunk/debian/changelog
   vdr/vdr-plugin-streamdev/trunk/debian/control
   vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
   vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
Log:
vdr-plugin-streamdev:
    - New upstream cvs release
    - Depend/Build-Depend on vdr >= 1.3.23-1
    - Conflict with vdr >=1.3.24
    - Added 02_vdr-1.3.23-fix.dpatch
    - Updated 01_Makefile-fPIC-fix.dpatch
    - Changed my email address to the one from Debian


Modified: vdr/vdr-plugin-streamdev/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/changelog	2005-04-10 13:02:56 UTC (rev 425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/changelog	2005-04-10 13:04:06 UTC (rev 426)
@@ -1,3 +1,17 @@
+vdr-plugin-streamdev (0.3.1+cvs20050410-1) experimental; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  
+  * Thomas Schmidt <tschmidt@debian.org>
+    - New upstream cvs release
+    - Depend/Build-Depend on vdr >= 1.3.23-1
+    - Conflict with vdr >=1.3.24
+    - Added 02_vdr-1.3.23-fix.dpatch
+    - Updated 01_Makefile-fPIC-fix.dpatch
+    - Changed my email address to the one from Debian
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 10 Apr 2005 12:21:50 +0200
+
 vdr-plugin-streamdev (0.3.1-4) unstable; urgency=low
 
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>

Modified: vdr/vdr-plugin-streamdev/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/control	2005-04-10 13:02:56 UTC (rev 425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/control	2005-04-10 13:04:06 UTC (rev 426)
@@ -3,13 +3,13 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Peter Siering <ps@ctmagazin.de>, Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
-Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.2.6-6), dpatch (>=2.0.9)
+Build-Depends: debhelper (>= 4.1.16), vdr-dev (>=1.3.23-1), dpatch (>=2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-streamdev-client
 Architecture: any
-Depends: vdr (>=1.2.6-6), ${shlibs:Depends}
-Conflicts: vdr-plugin-streamdev, vdr (>=1.2.7)
+Depends: vdr (>=1.3.23-1), ${shlibs:Depends}
+Conflicts: vdr-plugin-streamdev, vdr (>=1.3.24)
 Replaces: vdr-plugin-streamdev
 Description: Plugin to vdr that lets the software play streams
  This plugin for vdr lets the software stream videos into
@@ -20,8 +20,8 @@
 
 Package: vdr-plugin-streamdev-server
 Architecture: any
-Depends: vdr (>=1.2.6-6), ${shlibs:Depends}
-Conflicts: vdr-plugin-streamdev, vdr (>=1.2.7)
+Depends: vdr (>=1.3.23-1), ${shlibs:Depends}
+Conflicts: vdr-plugin-streamdev, vdr (>=1.3.24)
 Replaces: vdr-plugin-streamdev
 Description: Plugin to vdr that lets the software stream
  This plugin for vdr lets the software stream videos into

Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2005-04-10 13:02:56 UTC (rev 425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/00list	2005-04-10 13:04:06 UTC (rev 426)
@@ -1 +1,2 @@
 01_Makefile-fPIC-fix
+02_vdr-1.3.23-fix

Modified: vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-04-10 13:02:56 UTC (rev 425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-04-10 13:04:06 UTC (rev 426)
@@ -2,12 +2,12 @@
 ## Makefile-fPIC-fix patch
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefiles to fix potential FTBFS.
+## DP: Adds -fPIC to Makefile to fix potential FTBFS.
 
 @DPATCH@
-diff -urNad /usr/src/cvs/vdrdevel-plugin-streamdev/Makefile vdrdevel-plugin-streamdev/Makefile
---- /usr/src/cvs/vdrdevel-plugin-streamdev/Makefile	Mon Feb 16 13:08:37 2004
-+++ vdrdevel-plugin-streamdev/Makefile	Sat Sep 11 15:29:36 2004
+diff -urNad vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile /tmp/dpep.vNORJt/vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile
+--- vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile	2005-04-10 12:27:17.155199000 +0200
++++ /tmp/dpep.vNORJt/vdr-plugin-streamdev-0.3.1+cvs20050410/Makefile	2005-04-10 12:27:17.511144888 +0200
 @@ -16,7 +16,7 @@
  ### The C++ compiler and options:
  
@@ -17,13 +17,3 @@
  
  ### The directory environment:
  
-diff -urNad /usr/src/cvs/vdrdevel-plugin-streamdev/libdvbmpeg/Makefile vdrdevel-plugin-streamdev/libdvbmpeg/Makefile
---- /usr/src/cvs/vdrdevel-plugin-streamdev/libdvbmpeg/Makefile	Fri Sep 26 15:20:39 2003
-+++ vdrdevel-plugin-streamdev/libdvbmpeg/Makefile	Sat Sep 11 15:32:00 2004
-@@ -1,5 +1,5 @@
- INCS   = -I.
--CFLAGS =  -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-+CFLAGS = -fPIC -g -Wall -O2 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
- MFLAG  = -M
- OBJS = ctools.o ringbuffy.o remux.o transform.o cpptools.o
- SRC  = $(wildcard *.c)

Added: vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr-1.3.23-fix.dpatch
===================================================================
--- vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr-1.3.23-fix.dpatch	2005-04-10 13:02:56 UTC (rev 425)
+++ vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr-1.3.23-fix.dpatch	2005-04-10 13:04:06 UTC (rev 426)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_vdr-1.3.23-fix.dpatch by Thomas Schmidt <tschmidt@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation with vdr 1.3.23
+
+@DPATCH@
+diff -urNad vdr-plugin-streamdev-0.3.1+cvs20050410/client/menu.c /tmp/dpep.6QtlQj/vdr-plugin-streamdev-0.3.1+cvs20050410/client/menu.c
+--- vdr-plugin-streamdev-0.3.1+cvs20050410/client/menu.c	2005-04-10 12:19:25.000000000 +0200
++++ /tmp/dpep.6QtlQj/vdr-plugin-streamdev-0.3.1+cvs20050410/client/menu.c	2005-04-10 12:35:04.030223208 +0200
+@@ -138,7 +138,9 @@
+ 		Add(new cMenuEditBitItem( tr("Active"),       &m_Data.m_Active, tfActive));
+ #endif
+     Add(new cMenuEditChanItem(tr("Channel"),      &m_Channel));
++#if VDRVERSNUM < 10323
+     Add(new cMenuEditDayItem( tr("Day"),          &m_Data.m_Day));
++#endif
+     Add(new cMenuEditTimeItem(tr("Start"),        &m_Data.m_Start));
+     Add(new cMenuEditTimeItem(tr("Stop"),         &m_Data.m_Stop));
+ #if VDRVERSNUM >= 10300


Property changes on: vdr/vdr-plugin-streamdev/trunk/debian/patches/02_vdr-1.3.23-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *