[freeciv] 02/07: Don't convert icons to xpm images anymore and drop imagemagick from B-D.

Markus Koschany apo at moszumanska.debian.org
Sat May 13 17:37:00 UTC 2017


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

apo pushed a commit to branch master
in repository freeciv.

commit afd532a8f29feca9dec6937fa46d0e2a534f4a74
Author: Markus Koschany <apo at debian.org>
Date:   Sat May 13 18:39:15 2017 +0200

    Don't convert icons to xpm images anymore and drop imagemagick from B-D.
---
 debian/control              | 2 --
 debian/freeciv-data.install | 2 --
 debian/rules                | 6 ------
 3 files changed, 10 deletions(-)

diff --git a/debian/control b/debian/control
index 7cf7cc7..dbc8161 100644
--- a/debian/control
+++ b/debian/control
@@ -32,8 +32,6 @@ Build-Depends:
  qtbase5-dev,
  qtbase5-dev-tools,
  zlib1g-dev
-Build-Depends-Indep:
- imagemagick
 
 Package: freeciv
 Architecture: all
diff --git a/debian/freeciv-data.install b/debian/freeciv-data.install
index 02d7a45..6e082a7 100644
--- a/debian/freeciv-data.install
+++ b/debian/freeciv-data.install
@@ -1,5 +1,3 @@
-freeciv-server.xpm  usr/share/pixmaps
-freeciv.xpm         usr/share/pixmaps
 usr/share/games/freeciv
 usr/share/icons
 usr/share/locale
diff --git a/debian/rules b/debian/rules
index a7ca425..e90ac29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,10 +33,6 @@ override_dh_auto_configure:
 		--without-freeciv-manual \
 		--with-missinglist
 
-override_dh_auto_build-indep:
-	convert -monitor data/icons/32x32/freeciv-client.png freeciv.xpm
-	convert -monitor data/icons/32x32/freeciv-server.png freeciv-server.xpm
-
 override_dh_install:
 	# Move stuff that gets lost thanks to ${datadir}
 	mv debian/tmp/usr/share/games/icons debian/tmp/usr/share
@@ -83,8 +79,6 @@ override_dh_link:
 
 override_dh_clean:
 	dh_clean
-	rm -f freeciv.xpm
-	rm -f freeciv-server.xpm
 	find . -name '*.o' -delete
 	find . -name '.libs' -delete
 	find . -name '.dists' -delete

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



More information about the Pkg-games-commits mailing list