[openarena] 06/11: Stop installing the legacy Debian menu file

Simon McVittie smcv at debian.org
Fri Jan 22 12:06:14 UTC 2016


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

smcv pushed a commit to branch master
in repository openarena.

commit c2a958d5ff79b02465cc7086fb631a325baac0b2
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jan 22 10:24:40 2016 +0000

    Stop installing the legacy Debian menu file
    
      - stop converting the icon to XPM format
      - no longer needs a build-dependency on imagemagick
---
 debian/changelog         | 3 +++
 debian/control           | 1 -
 debian/openarena.install | 1 -
 debian/openarena.menu    | 7 -------
 debian/rules             | 2 --
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7d594e..5ae319b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ openarena (0.8.8-15) UNRELEASED; urgency=medium
     "q3arch make i386 linux-gnu", to avoid repeated invocation
   * openarena Recommends openarena-oacmp1 now that it is in Debian,
     and openarena-server Suggests it
+  * Stop installing the legacy Debian menu file
+    - stop converting the icon to XPM format
+    - no longer needs a build-dependency on imagemagick
 
  -- Simon McVittie <smcv at debian.org>  Sun, 02 Aug 2015 14:15:44 +0100
 
diff --git a/debian/control b/debian/control
index 7701e91..da64cf5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Simon McVittie <smcv at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
-               imagemagick,
                ioquake3-server (>= 1.36+u20150730+dfsg1-1~),
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-games/openarena.git
diff --git a/debian/openarena.install b/debian/openarena.install
index 4d516de..a4dfef2 100644
--- a/debian/openarena.install
+++ b/debian/openarena.install
@@ -1,6 +1,5 @@
 debian/scripts/openarena usr/games
 debian/openarena.desktop usr/share/applications
 debian/openarena128.png usr/share/icons/hicolor/128x128/apps
-debian/openarena32.xpm usr/share/pixmaps
 debian/tmp/usr/lib/openarena/*/*.so
 debian/tmp/usr/lib/openarena/*/*/*.so
diff --git a/debian/openarena.menu b/debian/openarena.menu
deleted file mode 100644
index 150fad5..0000000
--- a/debian/openarena.menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(openarena): \
-	needs="X11" \
-	section="Games/Action" \
-	title="OpenArena" \
-	longtitle="A fast-paced 3D first-person shooter, inspired by id Software Inc.'s Quake III Arena" \
-	icon="/usr/share/pixmaps/openarena32.xpm" \
-	command="/usr/games/openarena"
diff --git a/debian/rules b/debian/rules
index 731158c..e180e80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,6 @@ override_dh_clean:
 override_dh_auto_clean:
 	rm -f build-stamp
 	rm -rf build
-	rm -f debian/openarena32.xpm
 	rm -f debian/scripts/openarena
 	rm -f debian/scripts/openarena-server
 
@@ -113,7 +112,6 @@ override_dh_auto_install:
 		debian/tmp/usr/lib/openarena-server/baseoa/
 	install -m644 build/normal/missionpack/qagame*.so\
 		debian/tmp/usr/lib/openarena-server/missionpack/
-	convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm
 
 override_dh_strip:
 	dh_strip --dbg-package=openarena-dbg

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



More information about the Pkg-games-commits mailing list