[SCM] mixxx/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2a14e3c02983fd60387904a639be83cf59ae5945
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 18 15:05:28 2010 +0200

    Refresh

diff --git a/debian/patches/30-disable_soundsourcem4a.patch b/debian/patches/30-disable_soundsourcem4a.patch
index 68460f5..cb73006 100644
--- a/debian/patches/30-disable_soundsourcem4a.patch
+++ b/debian/patches/30-disable_soundsourcem4a.patch
@@ -1,16 +1,14 @@
 ---
- plugins/SConscript |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ plugins/SConscript |    2 --
+ 1 file changed, 2 deletions(-)
 
 --- mixxx.orig/plugins/SConscript
 +++ mixxx/plugins/SConscript
-@@ -4,7 +4,7 @@
- Import('build_dir')
+@@ -5,7 +5,5 @@ Import('build_dir')
+ Import('env', 'flags', 'platformString')
  
  plugins = [] 
--soundsourcem4a = SConscript(File('soundsourcem4a/SConscript'), build_dir=Dir(build_dir), duplicate=0) 
+-soundsourcem4a = SConscript(File('soundsourcem4a/SConscript'), build_dir=Dir(build_dir), duplicate=0, exports=['env','flags', 'platformString']) 
 -plugins.extend(soundsourcem4a)
-+#soundsourcem4a = SConscript(File('soundsourcem4a/SConscript'), build_dir=Dir(build_dir), duplicate=0)
-+#plugins.extend(soundsourcem4a)
  
  Return("plugins")
diff --git a/debian/patches/series b/debian/patches/series
index 0131e80..e060b29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 10_uptodate_configure.dpatch
 #10_soundtouch.dpatch
-# 20_norpath.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch

-- 
mixxx packaging