Drop XPM icons now that .menu files have retired (per #741573).

* debian/control: Drop build dependency on imagemagick.
* debian/*.install: Stop installing XPM icons.
* debian/rules: Stop generating XPM icons, needed only for the retired
  .menu entries.

5 files changed, 5 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 4e931b9..f86c018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
 fltk1.3 (1.3.3-6) UNRELEASED; urgency=medium
 
   * NOT YET RELEASED.
+  * debian/control: Drop build dependency on imagemagick entirely.
+  * debian/install: Stop installing XPM icons.
   * debian/rules:
     - Reinstate unhardened fltk-config more robustly.
       (Closes: #809711, #809825.)
+    - Stop generating XPM icons, needed only for the retired .menu entries.
 
- -- Aaron M. Ucko <ucko@debian.org>  Mon, 04 Jan 2016 22:38:11 -0500
+ -- Aaron M. Ucko <ucko@debian.org>  Mon, 04 Jan 2016 22:44:16 -0500
 
 fltk1.3 (1.3.3-5) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 3cea808..d6d0052 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                zlib1g-dev | libz-dev
 Build-Depends-Arch: cmake,
-                    imagemagick,
                     libasound2-dev [linux-any]
 Build-Depends-Indep: doxygen-latex, texlive-font-utils
 Standards-Version: 3.9.6
diff --git a/debian/fltk1.3-games.install b/debian/fltk1.3-games.install
index 5b73856..f9a2cf2 100644
--- a/debian/fltk1.3-games.install
+++ b/debian/fltk1.3-games.install
@@ -6,6 +6,3 @@ usr/share/icons/hicolor/*/apps/flblocks.png
 usr/share/icons/hicolor/*/apps/flcheckers.png
 usr/share/icons/hicolor/*/apps/flsudoku.png
 usr/share/man/man6
-usr/share/pixmaps/flblocks-32.xpm
-usr/share/pixmaps/flcheckers-32.xpm
-usr/share/pixmaps/flsudoku-32.xpm
diff --git a/debian/fluid.install b/debian/fluid.install
index 65db6ff..5ed50e5 100644
--- a/debian/fluid.install
+++ b/debian/fluid.install
@@ -2,4 +2,3 @@ usr/bin/fluid
 usr/share/applications/fluid.desktop
 usr/share/icons/hicolor/*/apps/fluid.png
 usr/share/mimelnk/application/x-fluid.desktop
-usr/share/pixmaps/fluid-32.xpm
diff --git a/debian/rules b/debian/rules
index f26759e..0fd8f90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,14 +80,11 @@ override_dh_auto_install-arch:
 	    cp test/desktop/$$game-128.png \
 	      debian/tmp/usr/share/icons/hicolor/128x128/apps/fl$$game.png && \
 	    sed -e '1s,^\.TH ,&fl,; 3s,^,fl,' documentation/src/$$game.man \
-	      >debian/tmp/usr/share/man/man6/fl$$game.6 && \
-	    convert test/desktop/$$game-32.png \
-	      debian/tmp/usr/share/pixmaps/fl$$game-32.xpm \
+	      >debian/tmp/usr/share/man/man6/fl$$game.6 \
 	    || exit 1; \
 	done
 ## fluid
 	$(MAKE) -C fluid install-linux DESTDIR=$(CURDIR)/debian/tmp
-	cp fluid/icons/fluid-32.xpm debian/tmp/usr/share/pixmaps
 ## libfltk1.3-dev
 	cp debian/CMakeCache.txt CMakeTmp/etc/*.cmake debian/tmp/usr/lib/fltk