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

[Tobias Grimm]

Author: tiber-guest
Date: 2006-03-12 16:49:28 +0000 (Sun, 12 Mar 2006)
New Revision: 2002

Removed:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/TODO
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
   vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
Log:
- New upstream release
- Removed 01_Makefile-fPIC-fix - fixed in upstream


Modified: vdr/vdr-plugin-softdevice/trunk/debian/TODO
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/TODO	2006-03-12 16:30:10 UTC (rev 2001)
+++ vdr/vdr-plugin-softdevice/trunk/debian/TODO	2006-03-12 16:49:28 UTC (rev 2002)
@@ -1,7 +1,3 @@
 TODO:
 
-- ???
-
-DONE:
-
-- Make package for DVB++ -> done by Guillem Jover
+- watch file is broken

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-03-12 16:30:10 UTC (rev 2001)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2006-03-12 16:49:28 UTC (rev 2002)
@@ -1,3 +1,13 @@
+vdr-plugin-softdevice (0.2.2-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET)
+  
+  * Tobias Grimm <tg at e-tobi.net>
+    - New upstream release
+    - Removed 01_Makefile-fPIC-fix - fixed in upstream
+
+ -- Debian VDR Team  <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 12 Mar 2006 17:26:58 +0100
+
 vdr-plugin-softdevice (0.2.1-4) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2006-03-12 16:30:10 UTC (rev 2001)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2006-03-12 16:49:28 UTC (rev 2002)
@@ -1,4 +1,3 @@
-01_Makefile-fPIC-fix
 02_disable_unsupported_output
 03_no_sub_libs
 04_debian_ffmpeg

Deleted: vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-03-12 16:30:10 UTC (rev 2001)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2006-03-12 16:49:28 UTC (rev 2002)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt at in.stud.tu-ilmenau.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds -fPIC to Makefile 
-
- at DPATCH@
-diff -urNad vdr-plugin-softdevice-0.2.1~/Makefile vdr-plugin-softdevice-0.2.1/Makefile
---- vdr-plugin-softdevice-0.2.1~/Makefile	2005-10-06 23:28:11.000000000 +0200
-+++ vdr-plugin-softdevice-0.2.1/Makefile	2005-12-04 01:37:37.000000000 +0100
-@@ -184,7 +184,7 @@
- ### normally you shoudn't have to touch something below this line
- 
- CXX      ?= g++
--CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch	2006-03-12 16:30:10 UTC (rev 2001)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch	2006-03-12 16:49:28 UTC (rev 2002)
@@ -5,24 +5,21 @@
 ## DP: Compile with static Debian ffmpeg libs
 
 @DPATCH@
-diff -urNad vdr-plugin-softdevice-0.2.1~/Makefile vdr-plugin-softdevice-0.2.1/Makefile
---- vdr-plugin-softdevice-0.2.1~/Makefile	2005-12-04 01:39:02.000000000 +0100
-+++ vdr-plugin-softdevice-0.2.1/Makefile	2005-12-04 01:40:02.000000000 +0100
-@@ -101,7 +101,7 @@
+diff -urNad vdr-plugin-softdevice-0.2.2~/Makefile vdr-plugin-softdevice-0.2.2/Makefile
+--- vdr-plugin-softdevice-0.2.2~/Makefile	2006-03-12 17:34:27.000000000 +0100
++++ vdr-plugin-softdevice-0.2.2/Makefile	2006-03-12 17:35:06.000000000 +0100
+@@ -102,12 +102,12 @@
+ #FFMPEGCFLAGS=-I../../../../ffmpeg/libavcodec
  #
+ # If you installed ffmpeg's lib (make installlib)
+-FFMPEGCFLAGS=-I/usr/local/include/ffmpeg/
++FFMPEGCFLAGS=`ffmpeg-config --cflags`
+ #FFMPEGCFLAGS=-I/home/extra/src/video/ffmpeg-0.4.8/libavcodec
  #
+ #
  # DON'T touch this:
 -FFMPEGLIBS = -lavcodec -lavformat -lz
 +FFMPEGLIBS = `ffmpeg-config --plugin-libs avcodec avformat`
  #
  # -----------------------------------------------------------------------------
  # Depending on your ffmpeg lib you may need some additional libs
-@@ -184,7 +184,7 @@
- ### normally you shoudn't have to touch something below this line
- 
- CXX      ?= g++
--CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual `ffmpeg-config --cflags`
- 
- ### The directory environment:
-