r7055 - in /vdr/vdr-plugin-bitstreamout/trunk/debian: changelog control patches/00list patches/03_hppa-workaround.dpatch rules

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Wed Jul 16 21:46:22 2008
New Revision: 7055

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7055
Log:
* Added 03_hppa-workaround.dpatch to fix FTBFS on hppa (Closes: #489491)
* Bumped Standards-Version to 3.8.0
* Dropped patchlevel control field
* Build-Depend on vdr-dev (>=1.6.0-5)

Added:
    vdr/vdr-plugin-bitstreamout/trunk/debian/patches/03_hppa-workaround.dpatch
Modified:
    vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
    vdr/vdr-plugin-bitstreamout/trunk/debian/control
    vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
    vdr/vdr-plugin-bitstreamout/trunk/debian/rules

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/changelog?rev=7055&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog Wed Jul 16 21:46:22 2008
@@ -1,3 +1,12 @@
+vdr-plugin-bitstreamout (0.89b-3) UNRELEASED; urgency=low
+
+  * Added 03_hppa-workaround.dpatch to fix FTBFS on hppa (Closes: #489491)
+  * Bumped Standards-Version to 3.8.0
+  * Dropped patchlevel control field
+  * Build-Depend on vdr-dev (>=1.6.0-5)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Wed, 16 Jul 2008 23:37:20 +0200
+
 vdr-plugin-bitstreamout (0.89b-2) unstable; urgency=low
 
   * Upload to unstable

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/control?rev=7055&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/control (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/control Wed Jul 16 21:46:22 2008
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 5), cdbs, dpatch, po-debconf, vdr-dev (>= 1.6.0), libasound2-dev, libmad0-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 5), cdbs, dpatch, po-debconf, vdr-dev (>= 1.6.0-5), libasound2-dev, libmad0-dev
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/
 Homepage: http://bitstreamout.sourceforge.net/
@@ -16,4 +16,3 @@
  This plugin for VDR allows to pass AC3 audio streams received
  from a DVB card or other VDR devices to the SPDIF port of any
  ALSA-compatible sound card.
-XB-VDR-Patchlevel: ${vdr:Patchlevel}

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list?rev=7055&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list Wed Jul 16 21:46:22 2008
@@ -1,2 +1,3 @@
 01_vdr-include-fix
 02_fix-nostrip
+03_hppa-workaround

Added: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/03_hppa-workaround.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/patches/03_hppa-workaround.dpatch?rev=7055&op=file
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/03_hppa-workaround.dpatch (added)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/03_hppa-workaround.dpatch Wed Jul 16 21:46:22 2008
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_hppa-workaround.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes hppa FTBFS. On hppa, the linker seems to have a problem when
+## DP: gcc uses -o /dev/null.
+
+ at DPATCH@
+--- vdr-plugin-bitstreamout-0.89b.orig/Makefile
++++ vdr-plugin-bitstreamout-0.89b/Makefile
+@@ -45,8 +45,8 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
+-cc-include = $(shell $(CC) $(INCLUDES) -include $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1 && echo "-D$(2)")
+-cc-library = $(shell echo 'int main () { return 0; }' |$(CC) -l$(1:lib%=%) -o /dev/null -xc - > /dev/null 2>&1 && echo yes)
++cc-include = $(shell $(CC) $(INCLUDES) -include $(1) -S -o cc-include.tmp -xc /dev/null > /dev/null 2>&1 && echo "-D$(2)"; rm cc-include.tmp)
++cc-library = $(shell echo 'int main () { return 0; }' |$(CC) -l$(1:lib%=%) -o cc-library.tmp -xc - > /dev/null 2>&1 && echo yes ; rm cc-library.tmp)
+ 
+ INCLUDES += $(EXTRA_INCLUDES)
+ ifneq ($(wildcard $(VDRDIR)/include/),)

Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/rules?rev=7055&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/rules (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/rules Wed Jul 16 21:46:22 2008
@@ -15,6 +15,5 @@
 	rm -f debian/include
 
 common-binary-predeb-arch::
-	sh /usr/share/vdr-dev/patchlevel.sh subst
 	sh /usr/share/vdr-dev/dependencies.sh