[SCM] mixxx/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6c5dc22132fef863fe6fe8b5719f52b51dd88a7f
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 18 15:00:17 2010 +0200

    Refresh

diff --git a/debian/patches/20_norpath.patch b/debian/patches/20_norpath.patch
index 0929b17..6419669 100644
--- a/debian/patches/20_norpath.patch
+++ b/debian/patches/20_norpath.patch
@@ -1,16 +1,16 @@
 ---
- src/SConscript |    3 ---
+ src/SConscript.env |    3 ---
  1 file changed, 3 deletions(-)
 
---- mixxx.orig/src/SConscript
-+++ mixxx/src/SConscript
-@@ -759,9 +759,6 @@ if 'win' in platform:
- else:
- 	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
- 	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
--	if platform != 'osx':
--		env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
--	env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
- 	env.Append(CPPDEFINES = "_REENTRANT")
- 
- #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
+--- mixxx.orig/src/SConscript.env
++++ mixxx/src/SConscript.env
+@@ -820,9 +820,6 @@ if 'win' in platformString:
+ else:
+ 	env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax
+ 	env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g"""))
+-	if platformString != 'osx':
+-		env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
+-	env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib")
+ 	env.Append(CPPDEFINES = "_REENTRANT")
+ 
+ #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms
diff --git a/debian/patches/series b/debian/patches/series
index e060b29..0131e80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 10_uptodate_configure.dpatch
 #10_soundtouch.dpatch
+# 20_norpath.patch
 20_norpath.patch
 30-disable_soundsourcem4a.patch

-- 
mixxx packaging