r14974 - packages/trunk/boswars/debian

[Markus Koschany]

Author: apo-guest
Date: 2014-03-22 11:22:26 +0000 (Sat, 22 Mar 2014)
New Revision: 14974

Modified:
   packages/trunk/boswars/debian/boswars-data.install
   packages/trunk/boswars/debian/boswars.menu
   packages/trunk/boswars/debian/changelog
   packages/trunk/boswars/debian/compat
   packages/trunk/boswars/debian/control
   packages/trunk/boswars/debian/rules
Log:
fix #726214

Update boswars.menu and add an menu icon.


Modified: packages/trunk/boswars/debian/boswars-data.install
===================================================================
--- packages/trunk/boswars/debian/boswars-data.install	2014-03-21 06:28:26 UTC (rev 14973)
+++ packages/trunk/boswars/debian/boswars-data.install	2014-03-22 11:22:26 UTC (rev 14974)
@@ -1,9 +1,10 @@
-campaigns usr/share/games/boswars
-graphics  usr/share/games/boswars
-intro     usr/share/games/boswars
-languages usr/share/games/boswars
-maps      usr/share/games/boswars
-scripts   usr/share/games/boswars
-sounds    usr/share/games/boswars
-units     usr/share/games/boswars
-patches   usr/share/games/boswars
+campaigns           usr/share/games/boswars
+graphics            usr/share/games/boswars
+intro               usr/share/games/boswars
+languages           usr/share/games/boswars
+maps                usr/share/games/boswars
+scripts             usr/share/games/boswars
+sounds              usr/share/games/boswars
+units               usr/share/games/boswars
+patches             usr/share/games/boswars
+debian/boswars.xpm  usr/share/pixmaps

Modified: packages/trunk/boswars/debian/boswars.menu
===================================================================
--- packages/trunk/boswars/debian/boswars.menu	2014-03-21 06:28:26 UTC (rev 14973)
+++ packages/trunk/boswars/debian/boswars.menu	2014-03-22 11:22:26 UTC (rev 14974)
@@ -1,2 +1,6 @@
-?package(boswars):needs="X11" section="Games/Strategy"\
-  title="Bos Wars" command="/usr/games/boswars"
+?package(boswars):needs="X11" \
+  section="Games/Strategy" \
+  title="Bos Wars" \
+  longtitle="Bos Wars - a futuristic real-time strategy game" \
+  command="/usr/games/boswars" \
+  icon="/usr/share/pixmaps/boswars.xpm"

Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog	2014-03-21 06:28:26 UTC (rev 14973)
+++ packages/trunk/boswars/debian/changelog	2014-03-22 11:22:26 UTC (rev 14974)
@@ -1,9 +1,17 @@
 boswars (2.7-2) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
- -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:11 +0200
+  [ Markus Koschany ]
+  * Use compat level 9 and require debhelper >= 9.
+  * debian/control: Add imagemagick to Build-Depends-Indep.
+  * debian/rules: Convert desktop file icon to boswars.xpm and use it as menu
+    icon. Install it with boswars-data.install to /usr/share/pixmaps.
+  * Update boswars.menu. Add longtitle and icon entry. (Closes: #726214)
 
+ -- Markus Koschany <apo at gambaru.de>  Sat, 22 Mar 2014 11:22:48 +0100
+
 boswars (2.7-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/boswars/debian/compat
===================================================================
--- packages/trunk/boswars/debian/compat	2014-03-21 06:28:26 UTC (rev 14973)
+++ packages/trunk/boswars/debian/compat	2014-03-22 11:22:26 UTC (rev 14974)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/boswars/debian/control
===================================================================
--- packages/trunk/boswars/debian/control	2014-03-21 06:28:26 UTC (rev 14973)
+++ packages/trunk/boswars/debian/control	2014-03-22 11:22:26 UTC (rev 14974)
@@ -3,7 +3,8 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>, Marc Dequènes (Duck) <Duck at DuckCorp.org>
-Build-Depends: debhelper (>= 7.0.50), scons, libpng12-dev, libsdl1.2-dev, libvorbis-dev, liblua5.1-0-dev, pkg-config, libtheora-dev
+Build-Depends: debhelper (>= 9), scons, libpng12-dev, libsdl1.2-dev, libvorbis-dev, liblua5.1-0-dev, pkg-config, libtheora-dev
+Build-Depends-Indep: imagemagick
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/boswars/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/boswars/

Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules	2014-03-21 06:28:26 UTC (rev 14973)
+++ packages/trunk/boswars/debian/rules	2014-03-22 11:22:26 UTC (rev 14974)
@@ -9,9 +9,12 @@
 %:
 	dh $@
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	scons CPPFLAGS='$(CPPFLAGS)' CCFLAGS='$(CCFLAGS)' LINKFLAGS='$(LINKFLAGS)'
 
+override_dh_auto_build-indep:
+	convert -monitor -resize 32x32 units/tank/ico_tank.png debian/boswars.xpm
+
 override_dh_auto_install:
 
 override_dh_install:
@@ -32,6 +35,7 @@
 	scons -c
 	# Additional icon (see build-indep-stamp)
 	rm  -f debian/boswars.png
+	rm  -f debian/boswars.xpm
 	# Scons is stupid and leaves them behind no matter what.
 	rm  -f .sconsign.dblite
 	rm -rf .sconf_temp