[SCM] hydrogen packaging branch, master, updated. 1f8e4361335aef5d223885927c688d654b9566e2

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6cf638e99d8ed8ee049ea5ff2bd506ebba145d9a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Mar 2 16:17:39 2010 +0100

    Add patch 0001 to relax SCons linux2 resolving. Closes: bug#570557, thanks to dann frazier.

diff --git a/debian/patches/0001_relax_SCons_linux2_resolving.patch b/debian/patches/0001_relax_SCons_linux2_resolving.patch
new file mode 100644
index 0000000..ba38003
--- /dev/null
+++ b/debian/patches/0001_relax_SCons_linux2_resolving.patch
@@ -0,0 +1,28 @@
+Description: relax SCons linux2 resolving
+ Some architecutres, notably hppa, use the platform-string linux2-hppa,
+ so fails getting resolved as a linux2 architecture.  Fix is to cut at
+ 6th character.
+Author: Jonas Smedegaard <dr at jones.dk>
+Last-Update: 2010-03-02
+Index: hydrogen/Sconstruct
+===================================================================
+--- hydrogen.orig/Sconstruct
++++ hydrogen/Sconstruct
+@@ -47,7 +47,7 @@
+ 
+ 	env = Environment( options = opts )
+ 
+-	if sys.platform == "linux2" or sys.platform == "darwin":
++	if sys.platform[:6] == "linux2" or sys.platform == "darwin":
+ 		if str(env['debug']) == "1":
+ 			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
+ 			for flag in env["optflags"].split(" "):
+@@ -84,7 +84,7 @@
+ 	if sys.platform == "darwin":
+ 		ldflags.append( '-L/opt/local/lib' )
+ 
+-	if sys.platform == 'linux2':
++	if sys.platform[:6] == 'linux2':
+ 		ldflags.append('-lasound')
+ 
+ 	elif sys.platform == "win32":
diff --git a/debian/patches/series b/debian/patches/series
index fe1a2a8..3d174e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001_relax_SCons_linux2_resolving.patch
 #02_gcc41.patch
 #03_gcc43.patch
 #07_gcc44.patch

-- 
hydrogen packaging