[colobot] 34/62: Revert "Add menu file and xpm icon"

[Didier Raboud]

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

odyx pushed a commit to branch debian/master
in repository colobot.

commit ef4d1b01faa3653909f9470f4e7504c46199cce3
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Aug 6 14:15:18 2017 -0400

    Revert "Add menu file and xpm icon"
    
    This reverts commit a59d1606c3592fad39194c0bc6b49e555acf9f6f.
---
 debian/colobot.install | 1 -
 debian/colobot.menu    | 6 ------
 debian/control         | 1 -
 debian/rules           | 6 ------
 4 files changed, 14 deletions(-)

diff --git a/debian/colobot.install b/debian/colobot.install
index d968925..599c019 100644
--- a/debian/colobot.install
+++ b/debian/colobot.install
@@ -1,4 +1,3 @@
-debian/colobot.xpm usr/share/pixmaps/
 usr/games/colobot
 usr/lib/colobot/libCBot.so
 usr/share/applications/colobot.desktop
diff --git a/debian/colobot.menu b/debian/colobot.menu
deleted file mode 100644
index 6b8e812..0000000
--- a/debian/colobot.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(colobot):needs="X11" \
-  section="Games/Adventure" \
-  title="Colobot" \
-  longtitle="Colobot - Colonize with bots - Game to learn programming" \
-  icon="/usr/share/pixmaps/colobot.xpm" \
-  command="/usr/games/colobot"
diff --git a/debian/control b/debian/control
index 97146dd..e3e2e81 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  cmake,
  debhelper (>= 10.2.5~),
  google-mock,
- imagemagick,
  libboost-dev,
  libboost-filesystem-dev,
  libboost-regex-dev,
diff --git a/debian/rules b/debian/rules
index bd9d124..b3a3497 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,6 @@ override_dh_auto_configure:
 
 override_dh_auto_build-arch:
 	dh_auto_build -a
-	# obj-* is the default builddirectory in debhelper
-	convert obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/desktop/32/colobot.png debian/colobot.xpm
 
 override_dh_auto_build-indep:
 	dh_auto_build -i -- doc
@@ -35,10 +33,6 @@ endif
 
 override_dh_auto_test-indep:
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -f debian/colobot.xpm
-
 # can be removed after stretch have been released
 override_dh_strip:
 	dh_strip --ddeb-migration='colobot-dbg (<< 0.1.6-3~)'

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