[SCM] mixxx/master: Drop 15-various_archs_support.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Dec 27 09:53:03 UTC 2011
The following commit has been merged in the master branch:
commit c4c592ead3b24d30ba3517ff5fd218ac955f9b36
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Dec 27 10:52:52 2011 +0100
Drop 15-various_archs_support.patch, applied upstream.
diff --git a/debian/patches/15-various_archs_support.patch b/debian/patches/15-various_archs_support.patch
deleted file mode 100644
index 380b024..0000000
--- a/debian/patches/15-various_archs_support.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Allow compilation on more Debian ports.
-Author: Alessio Treglia <alessio at debian.org>
-Bug: https://launchpad.net/bugs/887551
-Bug-Debian: http://bugs.debian.org/598749
-Bug-Debian: http://bugs.debian.org/616177
-Forwarded: https://bugs.launchpad.net/mixxx/+bug/683029/comments/3
----
- build/mixxx.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- mixxx.orig/build/mixxx.py
-+++ mixxx/build/mixxx.py
-@@ -41,9 +41,11 @@ class MixxxBuild(object):
-
- if machine not in ['x86_64', 'x86', 'i686', 'i586',
- 'alpha', 'hppa', 'mips', 'mipsel', 's390',
-- 'sparc', 'ia64', 'armel', 'hurd-i386',
-+ 'sparc', 'ia64', 'armel', 'armhf', 'hurd-i386',
-+ 'sh3', 'sh4',
- 'kfreebsd-amd64', 'kfreebsd-i386',
- 'i486', 'i386', 'powerpc', 'powerpc64',
-+ 'powerpcspe', 's390x',
- 'amd64', 'AMD64', 'EM64T', 'INTEL64']:
- raise Exception("invalid machine type")
-
diff --git a/debian/patches/series b/debian/patches/series
index 93eb7e9..4ea9815 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
0001-update_configure.patch
-15-various_archs_support.patch
20_norpath.patch
30-disable_soundsourcem4a.patch
40-soundtouch.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index a5a7562..8b277f9 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,5 +1,4 @@
0001-update_configure.patch
-15-various_archs_support.patch
20_norpath.patch
30-disable_soundsourcem4a.patch
40-soundtouch.patch
--
mixxx packaging
More information about the pkg-multimedia-commits
mailing list