[game-data-packager] 247/293: Stop installing XPM icons

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit f9bd28359d3e1691c39d6103fcf4f33285143367
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Oct 2 10:02:42 2015 +0100

    Stop installing XPM icons
---
 Makefile              | 16 ----------------
 debian/changelog      |  1 +
 debian/quake.install  |  1 -
 debian/quake2.install |  1 -
 debian/quake3.install |  2 --
 5 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 928d277..293cd49 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,6 @@ obj = \
 	build/quake-server \
 	build/quake2-server \
 	build/quake3-server \
-	build/quake.xpm \
-	build/quake2.xpm \
 	build/24/quake.png \
 	build/24/quake-armagon.png \
 	build/24/quake-dissolution.png \
@@ -24,13 +22,9 @@ obj = \
 	build/quake2-reckoning.svg \
 	build/quake2-groundzero.svg \
 	build/quake3.png \
-	build/quake3.xpm \
-	build/quake332.xpm \
 	build/quake3-teamarena.png \
 	build/48/quake3.png \
 	build/48/quake3-teamarena.png \
-	build/quake3-teamarena.xpm \
-	build/quake3-teamarena32.xpm \
 	$(patsubst %,build/%/quake.png,$(layer_sizes)) \
 	$(patsubst %,build/%/quake-armagon.png,$(layer_sizes)) \
 	$(patsubst %,build/%/quake-dissolution.png,$(layer_sizes)) \
@@ -209,10 +203,6 @@ $(patsubst %,build/%/quake2-groundzero.png,$(layer_sizes)): build/%/quake2-groun
 		--export-png=$@ \
 		$<
 
-build/%.xpm: build/32/%.png
-	install -d build
-	convert $< $@
-
 clean:
 	rm -rf build
 
@@ -264,12 +254,6 @@ build/48/quake3.png: build/quake3.png Makefile
 	install -d build/48
 	convert -resize 48x48 $< $@
 
-build/%.xpm: build/%.png
-	convert $< $@
-
 build/48/quake3-teamarena.png: build/quake3-teamarena.png Makefile
 	install -d build/48
 	convert -resize 48x48 $< $@
-
-build/%32.xpm: build/%.png
-	convert -resize 32x32 $< $@
diff --git a/debian/changelog b/debian/changelog
index 5c6d771..a77d061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ quake (14) UNRELEASED; urgency=medium
     to 256x256, as recommended by the XDG Icon Theme spec
   * Stop installing traditional Debian menu files to comply with
     CTTE decision #741573
+  * Stop installing XPM icons
 
  -- Simon McVittie <smcv at debian.org>  Wed, 30 Sep 2015 13:28:10 +0200
 
diff --git a/debian/quake.install b/debian/quake.install
index 307972f..3eb9571 100644
--- a/debian/quake.install
+++ b/debian/quake.install
@@ -15,7 +15,6 @@ build/48/quake.png   /usr/share/icons/hicolor/48x48/apps
 build/quake          /usr/games
 build/quake-*.svg    /usr/share/icons/hicolor/scalable/apps
 build/quake.svg      /usr/share/icons/hicolor/scalable/apps
-build/quake.xpm      /usr/share/pixmaps
 need-data.sh         /usr/share/games/quake
 quake-armagon.desktop /usr/share/applications
 quake-dissolution.desktop /usr/share/applications
diff --git a/debian/quake2.install b/debian/quake2.install
index 009e6f8..2861ec1 100644
--- a/debian/quake2.install
+++ b/debian/quake2.install
@@ -6,6 +6,5 @@ build/32/quake2*.png                    usr/share/icons/hicolor/32x32/apps
 build/48/quake2*.png                    usr/share/icons/hicolor/48x48/apps
 build/quake2                            usr/games
 build/quake2*.svg                       usr/share/icons/hicolor/scalable/apps
-build/quake2*.xpm                       usr/share/pixmaps
 need-data.sh                            usr/share/games/quake2
 quake2*.desktop                         usr/share/applications
diff --git a/debian/quake3.install b/debian/quake3.install
index 3825bdc..c61f758 100644
--- a/debian/quake3.install
+++ b/debian/quake3.install
@@ -4,7 +4,5 @@ build/quake3.png                        usr/share/icons/hicolor/256x256/apps
 build/quake3-teamarena.png              usr/share/icons/hicolor/256x256/apps
 build/48/quake3.png                     usr/share/icons/hicolor/48x48/apps
 build/48/quake3-teamarena.png           usr/share/icons/hicolor/48x48/apps
-build/quake3.xpm                        usr/share/pixmaps
-build/quake332.xpm                      usr/share/pixmaps
 need-data.sh                            usr/share/games/quake3
 quake3*.desktop                         usr/share/applications

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git