r7371 - in /vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian: changelog patches/03_hppa-workaround.dpatch

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

Author: tiber-guest
Date: Sat Aug  9 12:37:06 2008
New Revision: 7371

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7371
Log:
Revisited 03_hppa-workaround.dpatch - this should now really fix
the FTBFS on hppa (Closes: #489491)
to be installed with the wrong API version (Closes: #494425)

Modified:
    vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/changelog
    vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/patches/03_hppa-workaround.dpatch

Modified: vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/changelog?rev=7371&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/changelog (original)
+++ vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/changelog Sat Aug  9 12:37:06 2008
@@ -1,7 +1,14 @@
+vdr-plugin-bitstreamout (0.89b-5) unstable; urgency=medium
+
+  * Revisited 03_hppa-workaround.dpatch - this should now really fix
+    the FTBFS on hppa (Closes: #489491)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 09 Aug 2008 14:15:35 +0200
+
 vdr-plugin-bitstreamout (0.89b-4) unstable; urgency=low
 
   * Added 04_APIVERSION.dpatch to fix an upstream bug, causing the plugin lib
-    to be installed with the wrong API version
+    to be installed with the wrong API version (Closes: #494425)
 
  -- Tobias Grimm <tg at e-tobi.net>  Tue, 22 Jul 2008 23:18:10 +0200
 

Modified: vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/patches/03_hppa-workaround.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/patches/03_hppa-workaround.dpatch?rev=7371&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/patches/03_hppa-workaround.dpatch (original)
+++ vdr/vdr-plugin-bitstreamout/tags/0.89b-40.89b-5/debian/patches/03_hppa-workaround.dpatch Sat Aug  9 12:37:06 2008
@@ -2,20 +2,23 @@
 ## 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.
+## DP: Fixes hppa FTBFS. On hppa, the linker seems to have a problem 
+## DP: with the the way gcc is used to detect if includes and libraries
+## DP: are available.
+## DP: Just assume, includes and libs exist, which should be safe in Debian.
 
 @DPATCH@
---- vdr-plugin-bitstreamout-0.89b.orig/Makefile
-+++ vdr-plugin-bitstreamout-0.89b/Makefile
+diff -urNad vdr-plugin-bitstreamout-0.89b~/Makefile vdr-plugin-bitstreamout-0.89b/Makefile
+--- vdr-plugin-bitstreamout-0.89b~/Makefile	2008-08-09 14:25:13.000000000 +0200
++++ vdr-plugin-bitstreamout-0.89b/Makefile	2008-08-09 14:26:10.000000000 +0200
 @@ -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)
++cc-include = $(shell echo "-D$(2)")
++cc-library = $(shell echo yes)
  
  INCLUDES += $(EXTRA_INCLUDES)
- ifneq ($(wildcard $(VDRDIR)/include/),)
+ ifneq ($(wildcard $(VDRDIR)),)