[SCM] mixxx/master: Remove xpm, no longer needed

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ba3022c5d28ac63c3497a1a9c64f5208fe62765
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jan 26 19:08:13 2016 +0100

    Remove xpm, no longer needed

diff --git a/debian/control b/debian/control
index 1ae9ba6..394c79d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
  autotools-dev,
  debhelper (>= 9),
  docbook-to-man,
- imagemagick,
  libaudiofile-dev,
  libchromaprint-dev,
  libexpat-dev,
diff --git a/debian/mixxx.dirs b/debian/mixxx.dirs
deleted file mode 100644
index c1da623..0000000
--- a/debian/mixxx.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/pixmaps
diff --git a/debian/mixxx.install b/debian/mixxx.install
index b7a3e82..7ac8fec 100644
--- a/debian/mixxx.install
+++ b/debian/mixxx.install
@@ -1,4 +1,3 @@
-mixxx.xpm usr/share/pixmaps
 usr/bin
 usr/lib
 usr/share/applications
diff --git a/debian/rules b/debian/rules
index e946b46..1a5a3d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,6 @@ endif
 	dh $@ --parallel --with=scour,autotools_dev
 
 override_dh_auto_build:
-	# create icons
-	convert res/images/mixxx-icon.png -geometry 32x32 mixxx.xpm
 	scons $(SCONS_OPTS) w=1
 	docbook-to-man debian/mixxx.sgml > mixxx.1
 
@@ -47,7 +45,7 @@ override_dh_auto_clean:
 	scons $(SCONS_OPTS) -c || true
 	rm -rf .sconf_temp/ cache/ linux_build/
 	dh_clean .sconsign.dblite cachecustom.py \
-		config.log src/build.h build/*.pyc mixxx.1 mixxx.xpm
+		config.log src/build.h build/*.pyc mixxx.1
 	dh_auto_clean
 
 override_dh_auto_install:

-- 
mixxx packaging