[SCM] mixxx/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e7150c1a21e2a14d8f9067f3030eb8013dc3cc77
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 23 10:53:01 2010 +0200

    Refresh patches.

diff --git a/debian/patches/20_norpath.patch b/debian/patches/20_norpath.patch
index 6419669..fe660a7 100644
--- a/debian/patches/20_norpath.patch
+++ b/debian/patches/20_norpath.patch
@@ -4,7 +4,7 @@
 
 --- mixxx.orig/src/SConscript.env
 +++ mixxx/src/SConscript.env
-@@ -820,9 +820,6 @@ if 'win' in platformString:
+@@ -835,9 +835,6 @@ if 'win' in platformString:
  else:
  	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
  	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
diff --git a/debian/patches/30-disable_soundsourcem4a.patch b/debian/patches/30-disable_soundsourcem4a.patch
index 9d67f2e..53b1032 100644
--- a/debian/patches/30-disable_soundsourcem4a.patch
+++ b/debian/patches/30-disable_soundsourcem4a.patch
@@ -7,11 +7,13 @@ Forwarded: not-needed
 
 --- mixxx.orig/plugins/SConscript
 +++ mixxx/plugins/SConscript
-@@ -5,7 +5,5 @@ Import('build_dir')
+@@ -5,9 +5,7 @@ Import('build_dir')
  Import('env', 'flags', 'platformString')
  
  plugins = [] 
--soundsourcem4a = SConscript(File('soundsourcem4a/SConscript'), build_dir=Dir(build_dir), duplicate=0, exports=['env','flags', 'platformString']) 
+-soundsourcem4a = SConscript(File('soundsourcem4a/SConscript'), build_dir=Dir(build_dir + "/m4a"), duplicate=0, exports=['env','flags', 'platformString']) 
+ soundsourcewv = SConscript(File('soundsourcewv/SConscript'), build_dir=Dir(build_dir + "/wv"), duplicate=0, exports=['env','flags', 'platformString'])
 -plugins.extend(soundsourcem4a)
+ plugins.extend(soundsourcewv)
  
  Return("plugins")
diff --git a/debian/patches/91-desktop_file.patch b/debian/patches/91-desktop_file.patch
index 0543ef2..32c65d9 100644
--- a/debian/patches/91-desktop_file.patch
+++ b/debian/patches/91-desktop_file.patch
@@ -2,19 +2,17 @@ Description: Fix desktop file as per spec.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 ---
- src/mixxx.desktop |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ src/mixxx.desktop |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- mixxx.orig/src/mixxx.desktop
 +++ mixxx/src/mixxx.desktop
-@@ -1,9 +1,8 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
+@@ -3,7 +3,7 @@ Version=1.0
  Name=Mixxx
+ GenericName=Digital DJ interface
  Comment=A digital DJ interface
 -Exec=pasuspender mixxx
 +Exec=mixxx
  Terminal=false
- Icon=ic_mixxx
+ Icon=mixxx-icon
  Type=Application

-- 
mixxx packaging