[SCM] Wormux PKG branch, master, updated. 3d810152742ad43723a615c6cdfaddbdac384896

[Felix Geyer]

The following commit has been merged in the master branch:
commit d5f063369126b5567f2beab9c6d2c3144e17decf
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Oct 5 20:22:54 2010 +0200

    Include wormux.xpm in the wormux package.

diff --git a/debian/rules b/debian/rules
index c2363ff..189425f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,7 @@ override_dh_auto_install:
 	rm debian/tmp/usr/share/games/wormux/font/DejaVuSans.ttf
 	rm debian/tmp/usr/share/games/wormux/font/VL-Gothic-Regular.ttf
 	
-	# symlink 32x32 icon instead
-	rm debian/tmp/usr/share/pixmaps/wormux_128x128.png
+	cp debian/tmp/usr/share/games/wormux/wormux_32x32.xpm debian/tmp/usr/share/pixmaps/wormux.xpm
 
 override_dh_auto_clean:
 	dh_auto_clean
diff --git a/debian/wormux.install b/debian/wormux.install
index 5ef9430..17f46b5 100644
--- a/debian/wormux.install
+++ b/debian/wormux.install
@@ -1,3 +1,4 @@
 usr/games/wormux
 usr/share/applications
 usr/share/man
+usr/share/pixmaps/wormux.xpm
diff --git a/debian/wormux.links b/debian/wormux.links
index 193cb21..8c0f484 100644
--- a/debian/wormux.links
+++ b/debian/wormux.links
@@ -1,4 +1,3 @@
-usr/share/games/wormux/wormux_32x32.xpm usr/share/pixmaps/wormux.xpm
 usr/share/games/wormux/wormux_32x32.png usr/share/icons/hicolor/32x32/apps/wormux.png
 usr/share/games/wormux/wormux_128x128.png usr/share/icons/hicolor/128x128/apps/wormux.png
 usr/share/games/wormux/wormux.svg usr/share/icons/hicolor/scalable/apps/wormux.svg
diff --git a/debian/wormux.lintian-overrides b/debian/wormux.lintian-overrides
deleted file mode 100644
index 249dfa2..0000000
--- a/debian/wormux.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# symlink to the actual xpm image in wormux-data
-wormux: menu-icon-missing /usr/share/pixmaps/wormux.xpm

-- 
Wormux PKG