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

[Jordi Mallach]

The following commit has been merged in the master branch:
commit 383174cbe70862828a45f140fc236c0c8b4f487b
Author: Jordi Mallach <jordi at debian.org>
Date:   Mon Jun 6 00:35:46 2011 +0200

    Credit Cesare and Emmanuel in the changelog.

diff --git a/debian/changelog b/debian/changelog
index 33185e9..7849201 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,25 @@ mame (0.142-2) UNRELEASED; urgency=low
   * Add castool and imgtool to mame-tools.
   * Improve desktop file and translate it to Catalan.
 
+  [ Cesare Falco ]
+  * Initial merge from Ubuntu package.
+  * Some imports from corresponding debian/ files from Ubuntu package:
+    - control: sdlmame/sdlmame-tools transitional packages
+      (upgrading from Ubuntu 10.04 LTS still needs them)
+    - rules:
+      + override dh_installchangelogs instead of dh_auto_install
+      + override_dh_install, exclude keymaps for OSX
+      + renamed clean to override_dh_auto_clean, moved up
+      + strip CR from source files
+    - watch: added URL for MESS
+    - mame-tools: removed unidasm, tool intended for development only
+    - manpages for mess, castool and imgtool
+
+  [ Emmanuel Kasper ]
+  * Fix clean rule on a clean tree.
+  * Add copyright information for MESS sources.
+  * Remove symlinking of megatech.xml.
+
  -- Jordi Mallach <jordi at debian.org>  Thu, 12 May 2011 16:37:27 +0200
 
 mame (0.142-1) unstable; urgency=low

-- 
packaging for the mame arcade game emulator