The following commit has been merged in the master branch:
commit 08cf37924b18a1b7025adf6dd30019155b009011
Author: Emmanuel Kasper <emman...@libera.cc>
Date: Thu Dec 1 14:45:12 2011 +0100
Revert "Merge of mess-only branch in master branch"
This reverts commit 32c27ff90fa2cb5663aaf2600feae6a5b13ba470, reversing
changes made to b7b10bd586479f28cd05a48c4c4a580e390cc2b4.
Conflicts:
debian/mame.install
diff --git a/debian/mame.install b/debian/mame.install
index 433e9a2..ec4de67 100644
--- a/debian/mame.install
+++ b/debian/mame.install
@@ -1,5 +1,8 @@
mame usr/games
artwork/*.png usr/share/games/mame/artwork
+debian/install/mame.xpm usr/share/pixmaps
+debian/install/mame.desktop usr/share/applications
+debian/mame.ini etc/mame
hash.mame/* usr/share/games/mame/hash
src/osd/sdl/keymaps/*.txt usr/share/games/mame/keymaps
--
packaging for the mame arcade game emulator
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
