[SCM] mixxx/master: Clean-up

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a335886180f08404f8e079bdb2edad6307ce57f
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 18 11:44:54 2010 +0200

    Clean-up

diff --git a/debian/mixxx.install b/debian/mixxx.install
index a1542cf..5e662aa 100644
--- a/debian/mixxx.install
+++ b/debian/mixxx.install
@@ -1,3 +1,5 @@
 usr/bin
 usr/share/pixmaps
 usr/share/applications
+mixxx.xpm
+mixxx-16.xpm
diff --git a/debian/rules b/debian/rules
index 4149d46..4387852 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-SCONS_OPTS = install_root=$(CURDIR)/debian/tmp/usr qtdir=/usr/share/qt4 prefix=/usr
-
 %:
 	dh $@
 
@@ -12,29 +7,16 @@ 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
-	# Add here commands to compile the package.
-	scons $(SCONS_OPTS)
+	dh_auto_build
 	docbook-to-man debian/mixxx.sgml > mixxx.1 
 
 override_dh_auto_clean:
-	dh clean --before dh_auto_clean
-	scons $(SCONS_OPTS) -c 
-	# hand cleaning
-	rm -rf .sconf_temp/ .sconsign.dblite build/qt4.pyc cachecustom.py \
-		config.log linux_build/ src/build.h
+	dh_auto_clean
 	rm -f mixxx.1 mixxx.xpm mixxx-16.xpm
-	dh clean --after dh_auto_clean
 
 override_dh_auto_install:
-	dh install --before dh_auto_install
-	mkdir -p $(CURDIR)/debian/tmp/usr
-	scons $(SCONS_OPTS) install
+	dh_auto_install
 	find $(CURDIR)/debian/tmp \( -name COPYING -o -name Thumbs.db \
 		-o -name shifter.sh -o -name '*.xsl' -o -name '*.php' \) \
 		-exec rm -f {} \;
 	find $(CURDIR)/debian/tmp -name '*.js' -exec chmod -x {} \; 
-	dh_install -ptmp debian/mixxx.desktop usr/share/applications
-	dh_install -ptmp mixxx.xpm usr/share/pixmaps
-	dh_install -ptmp mixxx-16.xpm usr/share/pixmaps
-	dh_install --sourcedir=$(CURDIR)/debian/tmp
-	dh install --after dh_auto_install

-- 
mixxx packaging