[SCM] mixxx/master: Remove the old debian/patches/40-alpha_ftbfs.patch patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Mar 3 23:49:40 UTC 2011


The following commit has been merged in the master branch:
commit e2cbb72776c8dde1fee18a6e603d8ea96ad8b6d9
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Mar 4 00:49:30 2011 +0100

    Remove the old debian/patches/40-alpha_ftbfs.patch patch.

diff --git a/debian/patches/40-alpha_ftbfs.patch b/debian/patches/40-alpha_ftbfs.patch
deleted file mode 100644
index ba4e9d9..0000000
--- a/debian/patches/40-alpha_ftbfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Get rid of the -Dalpha, fixes FTBFS on alpha.
-Author: Alessio Treglia <alessio at debian.org>
-Bug: https://launchpad.net/bugs/683029
-Bug-Debian: http://bugs.debian.org/598749
-Forwarded: yes
----
- src/SConscript.env |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- 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__')
diff --git a/debian/patches/series b/debian/patches/series
index dd134b5..552bfd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,4 @@
 15-various_archs_support.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
-#40-alpha_ftbfs.patch
 91-desktop_file.patch

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list