[SCM] mixxx/master: Really apply 40-alpha_ftbfs.patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 64f9869f62289a26d32559563d08f5fcb7b93e31
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 29 00:35:35 2010 +0100

    Really apply 40-alpha_ftbfs.patch.

diff --git a/debian/patches/40-alpha_ftbfs.patch b/debian/patches/40-alpha_ftbfs.patch
index 26e8fb4..99fcb2c 100644
--- a/debian/patches/40-alpha_ftbfs.patch
+++ b/debian/patches/40-alpha_ftbfs.patch
@@ -7,12 +7,12 @@ Author: Alessio Treglia <alessio at debian.org>
 --- mixxx.orig/src/SConscript.env
 +++ mixxx/src/SConscript.env
 @@ -769,7 +769,8 @@ if platformString in ('linux', 'bsd'):
- 
- #declare platform specific flags? though we shouldn't really need these, the compilers should Just Know...
- #on __APPLE__ it works like that. probably we just need to look into what the default __platform__ #defines are and search and replace in the code
--env.Append(CPPDEFINES=machine)
-+if not machine == 'alpha':
-+	env.Append(CPPDEFINES=machine)
- 
- if platformString == 'linux':
- 	env.Append(CPPDEFINES='__LINUX__')
+ 
+ #declare platform specific flags? though we shouldn't really need these, the compilers should Just Know...
+ #on __APPLE__ it works like that. probably we just need to look into what the default __platform__ #defines are and search and replace in the code
+-env.Append(CPPDEFINES=machine)
++if not machine == 'alpha':
++	env.Append(CPPDEFINES=machine)
+ 
+ if platformString == 'linux':
+ 	env.Append(CPPDEFINES='__LINUX__')
diff --git a/debian/patches/series b/debian/patches/series
index aaa767a..1ca9120 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 #10_soundtouch.dpatch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
+40-alpha_ftbfs.patch
 91-desktop_file.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index a8c53c5..e060b29 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -2,4 +2,3 @@
 #10_soundtouch.dpatch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
-40-alpha_ftbfs.patch

-- 
mixxx packaging