[SCM] Classic first person shooter branch, master, updated. 1ae341071f2cc8ba1d017bf83534a2ef2c9c814c

[David Banks]

The following commit has been merged in the master branch:
commit 1ae341071f2cc8ba1d017bf83534a2ef2c9c814c
Author: David Banks <amoebae at gmail.com>
Date:   Tue Jun 14 15:55:11 2011 +0100

    add menu icon

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9687292
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+# Makefile - used for building icon
+
+obj = quake quake.xpm
+
+
+all: $(obj)
+
+quake: quake.sh
+	cp $< $@
+	chmod +x $@
+
+quake.xpm: quake.png
+	convert -resize 32x32 $< $@
+
+clean: 
+	rm -f $(obj)
diff --git a/debian/control b/debian/control
index 8b14019..4c4df9d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Maintainer: David Banks <amoebae at gmail.com>
 Section: games
 Priority: optional
 Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: imagemagick
 Standards-Version: 3.9.2.0
 
 Package: quake
diff --git a/debian/copyright b/debian/copyright
index 80b61b0..94634ec 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,3 +4,8 @@ Files: *
 Copyright: 2011 David Banks
 License: GPL-3+
  Please refer to the file '/usr/share/common-licenses/GPL-3' on Debian systems.
+
+Files: quake.png
+Copyright: 2007 Rodney Dawes 
+License: GPL-2
+ Please refer to the file '/usr/share/common-licenses/GPL-2' on Debian systems.
diff --git a/debian/quake.install b/debian/quake.install
index 5473327..370fb4d 100644
--- a/debian/quake.install
+++ b/debian/quake.install
@@ -1,2 +1,3 @@
 quake          /usr/games
 quake.desktop  /usr/share/applications
+quake.xpm      /usr/share/pixmaps
diff --git a/debian/quake.menu b/debian/quake.menu
index 505ac3b..50bdc16 100644
--- a/debian/quake.menu
+++ b/debian/quake.menu
@@ -1 +1,2 @@
-?package(quake):needs="X11" section="Games/Action" title="Quake" command="quake"
+?package(quake):needs="X11" section="Games/Action" title="Quake" \
+  icon="/usr/share/pixmaps/quake.xpm" command="quake"
diff --git a/debian/rules b/debian/rules
index 65cfa31..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,3 @@
 
 %:
 	dh $@
-
-override_dh_auto_build:
-	cp quake.sh quake
-	chmod +x quake
-
-override_dh_auto_clean:
-	rm -f quake
diff --git a/quake.desktop b/quake.desktop
index 994566e..4013dd5 100644
--- a/quake.desktop
+++ b/quake.desktop
@@ -5,5 +5,6 @@ Type=Application
 Version=1.0
 Name=Quake
 Comment=Classic first person shooter
+Icon=quake
 Exec=/usr/games/quake
 Categories=Game;ActionGame;
diff --git a/quake.png b/quake.png
new file mode 100644
index 0000000..244a2e4
Binary files /dev/null and b/quake.png differ

-- 
Classic first person shooter