r1404 - in vdr/vdr-plugin-xine/trunk/debian: . patches

[Thomas Schmidt]

Author: tschmidt
Date: 2005-11-01 21:34:29 +0000 (Tue, 01 Nov 2005)
New Revision: 1404

Added:
   vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
Modified:
   vdr/vdr-plugin-xine/trunk/debian/changelog
   vdr/vdr-plugin-xine/trunk/debian/control
   vdr/vdr-plugin-xine/trunk/debian/patches/00list
   vdr/vdr-plugin-xine/trunk/debian/rules
Log:
vdr-plugin-xine: Updated for vdr 1.3.35; Added 01_Makefile-fPIC-fix.dpatch

Modified: vdr/vdr-plugin-xine/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/changelog	2005-11-01 21:21:20 UTC (rev 1403)
+++ vdr/vdr-plugin-xine/trunk/debian/changelog	2005-11-01 21:34:29 UTC (rev 1404)
@@ -1,8 +1,19 @@
-vdr-plugin-xine (0.7.6-2) unstable; urgency=low
+vdr-plugin-xine (0.7.6-3) unstable; urgency=low
 
   * NOT RELEASED YET
 
   * Thomas Schmidt <tschmidt at debian.org>
+    - Build-Depend on vdr (>=1.3.35-1)
+    - Removed CXXFLAGS as parameter from "make all" call in 
+      debian/rules
+    - Added 01_Makefile-fPIC-fix.dpatch to fix potential FTBFS on some
+      arches like amd64, hppa and others
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Tue,  1 Nov 2005 21:59:13 +0100
+
+vdr-plugin-xine (0.7.6-2) unstable; urgency=low
+
+  * Thomas Schmidt <tschmidt at debian.org>
     - Build-Depend on vdr (>=1.3.33-1)
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 25 Sep 2005 22:10:35 +0200

Modified: vdr/vdr-plugin-xine/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/control	2005-11-01 21:21:20 UTC (rev 1403)
+++ vdr/vdr-plugin-xine/trunk/debian/control	2005-11-01 21:34:29 UTC (rev 1404)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Darren Salt <linux at youmustbejoking.demon.co.uk>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>=1.3.33-1)
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxine-dev (>= 1.0.2-0vdr1), vdr-dev (>=1.3.35-1)
 Standards-Version: 3.6.2
 
 Package: vdr-plugin-xine

Modified: vdr/vdr-plugin-xine/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/00list	2005-11-01 21:21:20 UTC (rev 1403)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/00list	2005-11-01 21:34:29 UTC (rev 1404)
@@ -1,2 +1,3 @@
 01_debian
+01_Makefile-fPIC-fix
 02_symlink_security

Added: vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-11-01 21:21:20 UTC (rev 1403)
+++ vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-11-01 21:34:29 UTC (rev 1404)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile 
+
+ at DPATCH@
+diff -urNad vdr-plugin-xine-0.7.6/Makefile /tmp/dpep.xhL2DW/vdr-plugin-xine-0.7.6/Makefile
+--- vdr-plugin-xine-0.7.6/Makefile	2005-09-11 21:30:06.000000000 +0200
++++ /tmp/dpep.xhL2DW/vdr-plugin-xine-0.7.6/Makefile	2005-11-01 22:26:40.402979600 +0100
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
++CXXFLAGS ?= -O2 -fPIC -g -Wall -Woverloaded-virtual
+ #CXXFLAGS ?= -O0 -g3 -Wall -Woverloaded-virtual
+ 
+ ### The directory environment:


Property changes on: vdr/vdr-plugin-xine/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: vdr/vdr-plugin-xine/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-xine/trunk/debian/rules	2005-11-01 21:21:20 UTC (rev 1403)
+++ vdr/vdr-plugin-xine/trunk/debian/rules	2005-11-01 21:34:29 UTC (rev 1404)
@@ -40,7 +40,7 @@
 build: patch build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) all CXXFLAGS="$(CFLAGS)"
+	$(MAKE) all
 	touch build-stamp
 
 clean: clean-tree unpatch