[SCM] packaging for the mame arcade game emulator branch, master, updated. d632d127ace76db2869ca129a4a838b3fdb92002

[Cesare Falco]

The following commit has been merged in the master branch:
commit d632d127ace76db2869ca129a4a838b3fdb92002
Merge: ff88265390ca3f32ab04062f971a924930abf1b6 32c27ff90fa2cb5663aaf2600feae6a5b13ba470
Author: Cesare Falco <cesare.falco at gmail.com>
Date:   Wed Nov 30 18:24:39 2011 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame
    
    Conflicts:
    	debian/mame.install

diff --combined debian/mame.install
index 1467729,d8e1fcc..433e9a2
--- a/debian/mame.install
+++ b/debian/mame.install
@@@ -1,11 -1,10 +1,9 @@@
  mame usr/games
--debian/install/mame.xpm usr/share/pixmaps
--debian/install/mame.desktop usr/share/applications
--debian/mame.ini etc/mame
- artwork/* usr/share/games/mame/artwork
 -#hash.mame/* usr/share/games/mame/hash
++artwork/*.png usr/share/games/mame/artwork
 +hash.mame/* usr/share/games/mame/hash
  src/osd/sdl/keymaps/*.txt usr/share/games/mame/keymaps
  
++debian/mame.ini etc/mame
  debian/install/hicolor/16x16/apps/mame.png usr/share/icons/hicolor/16x16/apps
  debian/install/hicolor/22x22/apps/mame.png usr/share/icons/hicolor/22x22/apps
  debian/install/hicolor/24x24/apps/mame.png usr/share/icons/hicolor/24x24/apps
@@@ -13,4 -12,4 +11,6 @@@ debian/install/hicolor/32x32/apps/mame.
  debian/install/hicolor/48x48/apps/mame.png usr/share/icons/hicolor/48x48/apps
  debian/install/hicolor/72x72/apps/mame.png usr/share/icons/hicolor/72x72/apps
  debian/install/hicolor/128x128/apps/mame.png usr/share/icons/hicolor/128x128/apps
++debian/install/mame.xpm usr/share/pixmaps
++debian/install/mame.desktop usr/share/applications
  

-- 
packaging for the mame arcade game emulator