[SCM] mixxx/master: Update install and dirs file properly.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3df61b6b4b75bcecab2f79764175a2a43e1e5e13
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 18 15:43:32 2010 +0200

    Update install and dirs file properly.

diff --git a/debian/mixxx.dirs b/debian/mixxx.dirs
new file mode 100644
index 0000000..c1da623
--- /dev/null
+++ b/debian/mixxx.dirs
@@ -0,0 +1 @@
+usr/share/pixmaps
diff --git a/debian/mixxx.install b/debian/mixxx.install
index 5e662aa..6710799 100644
--- a/debian/mixxx.install
+++ b/debian/mixxx.install
@@ -1,5 +1,3 @@
 usr/bin
-usr/share/pixmaps
+mixxx.xpm usr/share/pixmaps
 usr/share/applications
-mixxx.xpm
-mixxx-16.xpm
diff --git a/debian/rules b/debian/rules
index f05c07e..f1af9ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ 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
+	rm -f mixxx.1 mixxx.xpm
 
 override_dh_auto_install:
 	scons $(SCONS_OPTS) install

-- 
mixxx packaging