From 8bf142da177acc287e4d5e5f53c26ee3cf074a60 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <[email protected]>
Date: Tue, 31 Jan 2017 19:47:24 -0500
Subject: [PATCH] Use .png app icons instead of obsolete .xpm, Drop Debian menu
Closes: #853805
---
debian/control | 2 +-
debian/install | 1 -
debian/menu | 6 ------
debian/rules | 14 +++++++++++---
4 files changed, 12 insertions(+), 11 deletions(-)
delete mode 100644 debian/install
delete mode 100644 debian/menu
diff --git a/debian/control b/debian/control
index ad0bbd3..59cfb9d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-python,
docbook-xml,
docbook-xsl,
- imagemagick,
+ icnsutils,
intltool,
python,
xsltproc
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 6870a45..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-unknown-horizons-32x32.xpm usr/share/pixmaps
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 8075772..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(unknown-horizons):needs="X11" \
- section="Games/Strategy" \
- title="Unknown Horizons" \
- longtitle="Unknown Horizons - 2D realtime strategy simulation" \
- command="/usr/games/unknown-horizons" \
- icon="/usr/share/pixmaps/unknown-horizons-32x32.xpm"
diff --git a/debian/rules b/debian/rules
index a43bf83..27f2862 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,17 @@ override_dh_auto_install:
debian/unknown-horizons/usr/share/unknown-horizons/content/fonts/OFL
# Remove executable bit from files like tm_* and make Lintian happy
find debian/unknown-horizons/usr/share/unknown-horizons -type f -exec chmod a-x {} \;
-
-override_dh_auto_build-indep:
- convert -monitor -resize 32x32 $(CURDIR)/content/packages/unknown-horizons.xpm $(CURDIR)/unknown-horizons-32x32.xpm
+ mkdir -p ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/16x16/apps
+ mkdir -p ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/32x32/apps
+ mkdir -p ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/128x128/apps
+ mkdir -p ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/256x256/apps
+ mkdir -p ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/512x512/apps
+ icns2png -x ${CURDIR}/content/gui/icons/Icon.icns -o ${CURDIR}
+ mv ${CURDIR}/Icon_16x16x32.png ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/16x16/apps/unknown-horizons.png
+ mv ${CURDIR}/Icon_32x32x32.png ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/32x32/apps/unknown-horizons.png
+ mv ${CURDIR}/Icon_128x128x32.png ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/128x128/apps/unknown-horizons.png
+ mv ${CURDIR}/Icon_256x256x32.png ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/256x256/apps/unknown-horizons.png
+ mv ${CURDIR}/Icon_512x512x32.png ${CURDIR}/debian/unknown-horizons/usr/share/icons/hicolor/512x512/apps/unknown-horizons.png
get-orig-source:
uscan --force-download --download-current-version --repack --compression xz
--
2.10.2
