[game-data-packager] 25/293: made .menu file debian compliant; build-depends on imagemagick, now

[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 f13a0ed9a9c61088d6c08e17bd3bdd057ada8a68
Author: Bruno "Fuddl" Kleinert <fuddl at debian.org>
Date:   Sat Apr 22 12:33:57 2006 +0000

    made .menu file debian compliant; build-depends on imagemagick, now
---
 debian/changelog     | 9 ++++++---
 debian/control       | 2 +-
 debian/ioquake3.dirs | 1 +
 debian/ioquake3.menu | 2 +-
 debian/rules         | 6 ++++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 15ef6b0..4446cea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-ioquake3 (1.34-rc1+svn708-1) unstable; urgency=low
-
+ioquake3 (1.34-rc1+svn708-1) UNRELEASED; urgency=low
+  [ Marc Leeman ]
   * Updated to SVN 708
   * Refreshed patches
   * new build needed for dependency on libopenal0a
   * Updated manpages (added more options and sorted them alphabetically)
 
- -- Marc Leeman <marc.leeman at gmail.com>  Sun, 16 Apr 2006 08:44:01 +0200
+  [ Bruno Kleinert ]
+  * made .menu file policy compliant
+
+ -- Bruno "Fuddl" Kleinert <fuddl at gmx.de>  Sat, 22 Apr 2006 14:04:18 +0200
 
 ioquake3 (1.34-rc1+svn632-1) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 30808a5..fac5e86 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Group <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Moritz Muehlenhoff <jmm at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev, docbook-to-man, libopenal-dev, quilt
+Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev, docbook-to-man, libopenal-dev, quilt, imagemagick
 Standards-Version: 3.6.2
 
 Package: ioquake3
diff --git a/debian/ioquake3.dirs b/debian/ioquake3.dirs
index 19a1ced..353c3b1 100644
--- a/debian/ioquake3.dirs
+++ b/debian/ioquake3.dirs
@@ -1,4 +1,5 @@
 usr/share/pixmaps
+usr/share/icons/hicolor/apps
 usr/lib/games/ioquake3/baseq3
 usr/lib/games/ioquake3/missionpack
 usr/games
diff --git a/debian/ioquake3.menu b/debian/ioquake3.menu
index 5e3313e..c9fa9ec 100644
--- a/debian/ioquake3.menu
+++ b/debian/ioquake3.menu
@@ -3,4 +3,4 @@
   section="Games/Arcade" \
   title="Quake III Arena" \
   command="/usr/games/ioquake3 --quiet" \
-  icon="/usr/share/pixmaps/ioquake3.svg"
+  icon="/usr/share/pixmaps/ioquake3_32x32.xpm"
diff --git a/debian/rules b/debian/rules
index 7fe5206..d5e5944 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ clean: unpatch
 	-$(MAKE) distclean
 	
 	# Clean up files we generated on our own
-	-rm -f build-stamp configure-stamp unpack-stamp ioq3ded.6 ioquake3.6 ioquake3.svg
+	-rm -f build-stamp configure-stamp unpack-stamp ioq3ded.6 ioquake3.6 ioquake3.svg ioquake3_32x32.xpm
 	-rm -rf .pc
 	dh_clean
 
@@ -63,10 +63,12 @@ install: build
 	cp build/release-linux-$(Q3ARCH)/ioquake3-smp.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioquake3-smp
 	cp build/release-linux-$(Q3ARCH)/ioq3ded.$(Q3ARCH) build/release-linux-$(Q3ARCH)/ioq3ded
 	cp code/unix/quake3.svg ioquake3.svg
+	convert -scale 32x32 code/unix/quake3.png ioquake3_32x32.xpm
 	
 	### client files
 	dh_install -pioquake3 debian/scripts/ioquake3 usr/games
-	dh_install -pioquake3 ioquake3.svg usr/share/pixmaps
+	dh_install -pioquake3 ioquake3.svg usr/share/icons/hicolor/scalable/apps
+	dh_install -pioquake3 ioquake3_32x32.xpm usr/share/pixmaps
 	dh_install -pioquake3 debian/ioquake3.desktop usr/share/applications # TODO waiting for dh_desktop to do that job! :(
 	dh_install -pioquake3 build/release-linux-$(Q3ARCH)/ioquake3 \
 		   build/release-linux-$(Q3ARCH)/ioquake3-smp \

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