[openjk] 14/19: Remove traditional Debian menu entries (prohibited by CTTE decision #741573) and the XPM icon that they used

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit 167d5e037028b112e098236b8dabdf4c04e8e3ea
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Mar 20 13:49:41 2016 +0000

    Remove traditional Debian menu entries (prohibited by CTTE decision #741573) and the XPM icon that they used
---
 debian/changelog             | 2 ++
 debian/openjk-academy.menu   | 6 ------
 debian/openjk-common.install | 1 -
 debian/openjk-outcast.menu   | 3 ---
 debian/rules                 | 1 -
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2129c66..0633e1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ openjk (0~20160320+dfsg1-1) UNRELEASED; urgency=medium
   * debian/watch: add (guessing at what releases will look like)
   * Build with full hardening options
   * Add patch fixing a typo in Siege mode
+  * Remove traditional Debian menu entries (prohibited by CTTE decision
+    #741573) and the XPM icon that they used
 
  -- Simon McVittie <smcv at debian.org>  Fri, 22 Jan 2016 11:09:04 +0000
 
diff --git a/debian/openjk-academy.menu b/debian/openjk-academy.menu
deleted file mode 100644
index b539744..0000000
--- a/debian/openjk-academy.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(openjk-academy):needs="X11" section="Games/Action"\
-  icon="/usr/share/pixmaps/openjk.xpm" \
-  title="Jedi Academy" command="/usr/games/openjk_sp --quiet"
-?package(openjk-academy):needs="X11" section="Games/Action"\
-  icon="/usr/share/pixmaps/openjk.xpm" \
-  title="Jedi Academy multiplayer" command="/usr/games/openjk --quiet"
diff --git a/debian/openjk-common.install b/debian/openjk-common.install
index 72fffbd..7c72a3f 100644
--- a/debian/openjk-common.install
+++ b/debian/openjk-common.install
@@ -1,5 +1,4 @@
 # Shared by Jedi Academy and Jedi Outcast
-debian/icons/openjk.xpm                usr/share/pixmaps
 debian/icons/16/openjk.png             usr/share/icons/hicolor/16x16/apps
 debian/icons/32/openjk.png             usr/share/icons/hicolor/32x32/apps
 debian/icons/128/openjk.png            usr/share/icons/hicolor/128x128/apps
diff --git a/debian/openjk-outcast.menu b/debian/openjk-outcast.menu
deleted file mode 100644
index 4c5e799..0000000
--- a/debian/openjk-outcast.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?package(openjk-outcast):needs="X11" section="Games/Action"\
-  icon="/usr/share/pixmaps/openjk.xpm" \
-  title="Jedi Knight II: Jedi Outcast" command="/usr/games/openjo_sp --quiet"
diff --git a/debian/rules b/debian/rules
index 2f479d6..a0fec13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,7 +135,6 @@ debian/icons: debian/rules
 	install -m644 shared/icons/OpenJK_Icon_16.png debian/icons/16/openjk.png
 	convert -resize 512x512 shared/icons/OpenJK_Icon_1024.png \
 		debian/icons/512/openjk.png
-	convert debian/icons/32/openjk.png debian/icons/openjk.xpm
 
 # no libraries here, only plugins
 override_dh_makeshlibs:

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