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

[Emmanuel Kasper]

The following commit has been merged in the master branch:
commit 268861b75a4613ebcb619bacb7866b5b72cca27f
Author: Emmanuel Kasper <emmanuel at libera.cc>
Date:   Thu Feb 17 19:09:55 2011 +0100

    Remove mame-regrep,mame-split,mame-src2html,mame-srcclean from mame-tools
    as suggested by upstream, cf
    http://forums.bannister.org/
    ubbthreads.php?ubb=showflat&Number=66395#Post66395

diff --git a/debian/changelog b/debian/changelog
index f7b9a94..e702935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ mame (0.141-2) UNRELEASED; urgency=low
   * Update VCS address to point to Alioth
   * Improve handling of upgrade in case of existing /etc/mame/mame.ini
   * Documentation improvements
+  * Remove mame-regrep,mame-split,mame-src2html,mame-srcclean from mame-tools
+  as suggested by upstream, cf
+  http://forums.bannister.org/
+  ubbthreads.php?ubb=showflat&Number=66395#Post66395
 
- -- Emmanuel Kasper <emmanuel at libera.cc>  Fri, 04 Feb 2011 11:06:07 +0100
+ -- Emmanuel Kasper <emmanuel at libera.cc>  Thu, 17 Feb 2011 19:06:59 +0100
 
 mame (0.141-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 1c8c3a3..949ba4c 100644
--- a/debian/control
+++ b/debian/control
@@ -45,10 +45,6 @@ Description: Tools for Multiple Arcade Machine Emulator (MAME)
   - jedutil (binary to/from JEDEC file converter)
   - ldresample (Laserdisc audio synchronizer and resampler)
   - ldverify (Laserdisc AVI/CHD verifier)
-  - mame-regrep (Regression test report generator)
-  - mame-split (Simple file splitter/joiner with hashes)
-  - mame-src2html (MAME source code to HTML converter)
-  - mame-srcclean (Basic source code cleaner)
   - romcmp (ROM comparison utility program)
   - testkeys (Keyboard code viewer)
   - unidasm (Generic MAME disassembler)
diff --git a/debian/mame-tools.install b/debian/mame-tools.install
index 535a919..c7991bb 100644
--- a/debian/mame-tools.install
+++ b/debian/mame-tools.install
@@ -2,10 +2,6 @@ chdman      usr/bin/
 jedutil     usr/bin/
 ldresample  usr/bin/
 ldverify    usr/bin/
-mame-regrep      usr/bin/
 romcmp      usr/bin/
-mame-split       usr/bin/
-mame-src2html    usr/bin/
-mame-srcclean    usr/bin/
 testkeys    usr/bin/
 unidasm     usr/bin/
diff --git a/debian/mame-tools.manpages b/debian/mame-tools.manpages
index 2bd46f5..b4a9259 100644
--- a/debian/mame-tools.manpages
+++ b/debian/mame-tools.manpages
@@ -8,7 +8,3 @@ src/osd/sdl/man/testkeys.1
 debian/man/ldresample.1
 debian/man/unidasm.1
 
-debian/man/mame-regrep.1
-debian/man/mame-split.1
-debian/man/mame-src2html.1
-debian/man/mame-srcclean.1
diff --git a/debian/patches/series b/debian/patches/series
index f5325c6..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-rename_tools.patch
diff --git a/debian/rules b/debian/rules
index bbfb91e..0756991 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,13 +69,6 @@ endif
 override_dh_auto_build:
 	$(MAKE) -j3 $(DEB_MAME_OPTS) all
 
-# mame-tools are renamed to avoid name collision with other binaries
-# (ie GNU split ) 
-	[ -f mame-split ] || mv split mame-split
-	[ -f mame-regrep ] || mv regrep mame-regrep
-	[ -f mame-srcclean ] || mv srcclean mame-srcclean
-	[ -f mame-src2html ] || mv src2html mame-src2html
-
 # dh_installchangelogs doesn't know about whatsnew.txt,
 # so we need to make an explicit call
 override_dh_auto_install:
@@ -89,16 +82,6 @@ override_dh_installdocs:
                    --exclude=newvideo.txt
 
 clean:
-	# Just before cleaning the sources, restore original names
-	test -f mame-split || exit 0; \
-	mv mame-split split
-	test -f mame-regrep || exit 0; \
-	mv mame-regrep regrep
-	test -f mame-srcclean || exit 0; \
-	mv mame-srcclean srcclean
-	test -f mame-src2html || exit 0; \
-	mv mame-src2html src2html
-	dh_clean build-stamp
 	$(MAKE) $(DEB_MAME_OPTS) clean
 
 # Convert upstream sources from zip to tar.bz2

-- 
packaging for the mame arcade game emulator