[SCM] mixxx/master: Oops

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 08756692d5dbedb89226380db98037cf1fc1587c
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 18 12:02:21 2010 +0200

    Oops

diff --git a/debian/rules b/debian/rules
index 4387852..05edc4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+SCONS_OPTS = install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr
+
 %:
 	dh $@
 
@@ -7,15 +9,17 @@ override_dh_auto_build:
 	# create icons
 	convert res/images/mixxx-icon.png -geometry 32x32 mixxx.xpm
 	convert res/images/mixxx-icon.png -geometry 16x16 mixxx-16.xpm
-	dh_auto_build
+	scons $(SCONS_OPTS)
 	docbook-to-man debian/mixxx.sgml > mixxx.1 
 
 override_dh_auto_clean:
 	dh_auto_clean
+	rm -rf .sconf_temp/ .sconsign.dblite build/qt4.pyc cachecustom.py \
+	config.log linux_build/ src/build.h
 	rm -f mixxx.1 mixxx.xpm mixxx-16.xpm
 
 override_dh_auto_install:
-	dh_auto_install
+	scons $(SCONS_OPTS) install
 	find $(CURDIR)/debian/tmp \( -name COPYING -o -name Thumbs.db \
 		-o -name shifter.sh -o -name '*.xsl' -o -name '*.php' \) \
 		-exec rm -f {} \;

-- 
mixxx packaging