r422 - in vdr/vdr-plugin-dvd/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-04-10 12:59:33 +0000 (Sun, 10 Apr 2005)
New Revision: 422

Modified:
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/control
   vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
Log:
vdr-plugin-dvd:
    - New upstream cvs release
    - Depend/Build-Depend on vdr (>=1.3.23-1)
    - Conflict with vdr (>=1.3.24)
    - Updated 01_Makefile-fPIC-fix.dpatch


Modified: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog	2005-04-10 12:58:00 UTC (rev 421)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2005-04-10 12:59:33 UTC (rev 422)
@@ -1,3 +1,15 @@
+vdr-plugin-dvd (0.3.5+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)
+    - Updated 01_Makefile-fPIC-fix.dpatch
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 10 Apr 2005 13:03:27 +0200
+
 vdr-plugin-dvd (0.3.4-rc10-5) unstable; urgency=low
 
   * Tobias Grimm <tg@e-tobi.net>

Modified: vdr/vdr-plugin-dvd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control	2005-04-10 12:58:00 UTC (rev 421)
+++ vdr/vdr-plugin-dvd/trunk/debian/control	2005-04-10 12:59:33 UTC (rev 422)
@@ -3,13 +3,13 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>
-Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.2.6-7), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.3.23-1), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
 Standards-Version: 3.6.1
 
 Package: vdr-plugin-dvd
 Architecture: any
-Depends: ${shlibs:Depends}, vdr (>=1.2.6)
-Conflicts: vdr (>=1.2.7)
+Depends: ${shlibs:Depends}, vdr (>=1.3.23-1)
+Conflicts: vdr (>=1.3.24)
 Suggests: libdvdcss2
 Description: Plugin to vdr for playing DVD's
  This plugin(s) for vdr allows you to play your DVD's from

Modified: vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-04-10 12:58:00 UTC (rev 421)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-04-10 12:59:33 UTC (rev 422)
@@ -6,15 +6,15 @@
 ## DP: Adds -fPIC to Makefile, to fix FTBFS
 
 @DPATCH@
-diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-dvd/vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile
---- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-dvd/vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile	2004-04-22 13:13:19.000000000 +0200
-+++ vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile	2004-07-30 20:49:52.000000000 +0200
+diff -urNad vdr-plugin-dvd-0.3.5+cvs20050410/Makefile /tmp/dpep.eUVMWZ/vdr-plugin-dvd-0.3.5+cvs20050410/Makefile
+--- vdr-plugin-dvd-0.3.5+cvs20050410/Makefile	2005-04-10 13:06:46.229665680 +0200
++++ /tmp/dpep.eUVMWZ/vdr-plugin-dvd-0.3.5+cvs20050410/Makefile	2005-04-10 13:07:15.226805640 +0200
 @@ -16,7 +16,7 @@
  ### The C++ compiler and options:
  
  CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+-CXXFLAGS ?= -O3 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O3 -Wall -Woverloaded-virtual
+ LDFLAGS  ?= $(CXXFLAGS)
  
  ### The directory environment:
-