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

2011-02-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 367a384130941d6bcda6558608281d42372e8258
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Feb 2 17:02:26 2011 +0100

Fix get-orig-source to create the orig.tar.gz in current working directory

diff --git a/debian/rules b/debian/rules
index c4f6f34..08da638 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,6 +117,6 @@ get-orig-source: fetch_upstream
mkdir -p $(TMPDIR)/sub/$(PACKAGE)-$(VERSION)
 # Not a bug: Mame source needs to be unzipped twice
unzip $(TMPDIR)/$(PACKAGE).zip -d $(TMPDIR)/sub/$(PACKAGE)-$(VERSION)
-   tar -C $(TMPDIR)/sub -cvf - . | bzip2 -c9   
../$(PACKAGE)_$(VERSION).orig.tar.bz2
+   tar -C $(TMPDIR)/sub -cvf - . | bzip2 -c9   
$(PACKAGE)_$(VERSION).orig.tar.bz2
rm -r $(TMPDIR)
rm -r $(FILEBASE)s.zip

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 489bd7fdd0c2f75fe2d7e1908175a169ac637a79
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Feb 2 17:07:11 2011 +0100

Update VCS addresses following the move to Alioth

diff --git a/debian/control b/debian/control
index 1b05da3..1c8c3a3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Ludovic Lechapt ludoma...@gmail.com
 Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Emmanuel Kasper 
emman...@libera.cc, Jordi Mallach jo...@debian.org
 Build-Depends: debhelper (= 7.0.50~), libexpat1-dev, libsdl1.2-dev, 
zlib1g-dev, libxinerama-dev, libgconf2-dev, libgtk2.0-dev, libsdl-ttf2.0-dev
 Standards-Version: 3.9.1
-Vcs-Git: git://git.shaperstudio.com/mamedeb.git
-Vcs-Browser: http://indefero.shaperstudio.com/p/mamedeb/source/tree/master/
+Vcs-Git: git://git.debian.org/pkg-games/mame.git
+Vcs-Browser: http://git.debian.org/?p=pkg-games/mame.git
 Homepage: http://mamedev.org
 XS-Autobuild: yes
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

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

2011-02-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 64e40d716a04c58053c064109d2e7611a0f6bd32
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Feb 6 20:02:55 2011 +0100

Remove Copyright files from doc packages, as it is redundant with our own
Deian Copyright file

diff --git a/debian/mame.docs b/debian/mame.docs
index 737d796..8d9501e 100644
--- a/debian/mame.docs
+++ b/debian/mame.docs
@@ -1,7 +1,2 @@
-whatsnew.txt
-docs/config.txt
-docs/mame.txt
-docs/newvideo.txt
-docs/windows.txt
-src/lib/softfloat/README.txt
-src/osd/sdl/README_SDL13.txt
+docs/*
+

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b5637eaab100f085e680b91cd2b9490ba9f95995
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Feb 6 20:04:15 2011 +0100

Update changelog to make it obvious work on the package is still going on

diff --git a/debian/changelog b/debian/changelog
index f7279fe..f7b9a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
+
+ -- Emmanuel Kasper emman...@libera.cc  Fri, 04 Feb 2011 11:06:07 +0100
+
 mame (0.141-1) experimental; urgency=low
 
   [ Emmanuel Kasper ]

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 56b7de58ee09568d63e9185615c554abbc9c3d2c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Feb 6 20:06:02 2011 +0100

Make dh_installdocs ignore useless files ( windows.txt and copyright.txt )

diff --git a/debian/rules b/debian/rules
index 08da638..09c6360 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ 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
@@ -81,6 +82,10 @@ override_dh_auto_install:
dh_auto_install
dh_installchangelogs whatsnew.txt
 
+# Remove useless docs
+override_dh_installdocs:
+   dh_installdocs --exclude=license.txt \
+   --exclude=windows.txt
 clean:
# Just before cleaning the sources, restore original names
test -f mame-split || exit 0; \

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit fc8f2cb6c3d178a8874b9490a88bc7350ac26526
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Feb 6 20:16:05 2011 +0100

Add newvideo.txt to list of useless files not to be packaged

diff --git a/debian/rules b/debian/rules
index 09c6360..bbfb91e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,10 +82,12 @@ override_dh_auto_install:
dh_auto_install
dh_installchangelogs whatsnew.txt
 
-# Remove useless docs
+# Remove Windows specific documentation
 override_dh_installdocs:
dh_installdocs --exclude=license.txt \
-   --exclude=windows.txt
+   --exclude=windows.txt \
+   --exclude=newvideo.txt
+
 clean:
# Just before cleaning the sources, restore original names
test -f mame-split || exit 0; \

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-17 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 268861b75a4613ebcb619bacb7866b5b72cca27f
Author: Emmanuel Kasper emman...@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=showflatNumber=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=showflatNumber=66395#Post66395
 
- -- Emmanuel Kasper emman...@libera.cc  Fri, 04 Feb 2011 11:06:07 +0100
+ -- Emmanuel Kasper emman...@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/
 ldverifyusr/bin/
-mame-regrep  usr/bin/
 romcmp  usr/bin/
-mame-split   usr/bin/
-mame-src2htmlusr/bin/
-mame-srccleanusr/bin/
 testkeysusr/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

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-18 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 4eff1af07c93832827b89b4616d7b680ca6cb951
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Feb 18 01:14:36 2011 +0100

Move tar.bz2 downloaded upstream tar one folder higher

diff --git a/debian/rules b/debian/rules
index 0756991..eab54ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,6 +107,6 @@ get-orig-source: fetch_upstream
mkdir -p $(TMPDIR)/sub/$(PACKAGE)-$(VERSION)
 # Not a bug: Mame source needs to be unzipped twice
unzip $(TMPDIR)/$(PACKAGE).zip -d $(TMPDIR)/sub/$(PACKAGE)-$(VERSION)
-   tar -C $(TMPDIR)/sub -cvf - . | bzip2 -c9   
$(PACKAGE)_$(VERSION).orig.tar.bz2
+   tar -C $(TMPDIR)/sub -cvf - . | bzip2 -c9   
../$(PACKAGE)_$(VERSION).orig.tar.bz2
rm -r $(TMPDIR)
rm -r $(FILEBASE)s.zip

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-18 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b2c82dd13991443b9fac9171075a636907f155a7
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Feb 18 02:08:00 2011 +0100

Fix wrong spacing

diff --git a/debian/mame.postinst b/debian/mame.postinst
index ce46437..55f7e43 100644
--- a/debian/mame.postinst
+++ b/debian/mame.postinst
@@ -41,7 +41,7 @@ if [ ! -e $INIFILE ]; then
 # or here for all users $INIFILE
 
 # Allow user defined profile in $HOME/.mame/mame.ini
-sed  -i 's, /etc/mame,$HOME/.mame;,' $INIFILE
+sed  -i 's,/etc/mame$,$HOME/.mame;,' $INIFILE
 
 # edit core search path options
 SYSTEM_PATH=/usr/share/games/mame  

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-18 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 43162ea848472d787f01c87c78b387b100d7da6e
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Feb 18 02:09:13 2011 +0100

Prevent useless libraries to be linked, especially for mame tools

diff --git a/debian/rules b/debian/rules
index eab54ae..e6667f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,8 @@ DEB_MAME_OPTS = \
 MAP= \
 VERBOSE= \
 OPTIMIZE=3 \
+LDFLAGS=-Wl,--as-needed \
+LDFLAGSEMULATOR=-Wl,--as-needed \
 DISTRO=gcc44-generic
 
 # Override make variables for specific archs

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-18 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 9d898e82e5ae005cf404cf6c5bd25035fd4e006f
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Feb 18 02:10:31 2011 +0100

Remove mame tools renaming patch

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..000

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-18 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 4860ff7d7c1c7261ad37c2738b9eccf92030285c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Feb 18 02:11:20 2011 +0100

Add newer upstream tarball

diff --git a/.gitignore b/.gitignore
index 158819e..78827e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ testkeys
 unidasm
 whatsnew.txt
 mame_0.139.orig.tar.gz
+mame_0.141.orig.tar.bz2

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-02-18 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 9e768633840bac6f77a4628d320af9c567521be3
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Feb 18 14:01:01 2011 +0100

changelog

diff --git a/debian/changelog b/debian/changelog
index e702935..a7b6a04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ mame (0.141-2) UNRELEASED; urgency=low
   as suggested by upstream, cf
   http://forums.bannister.org/
   ubbthreads.php?ubb=showflatNumber=66395#Post66395
+  * Link with --as-needed LDFLAGS
 
- -- Emmanuel Kasper emman...@libera.cc  Thu, 17 Feb 2011 19:06:59 +0100
+ -- Emmanuel Kasper emman...@libera.cc  Fri, 18 Feb 2011 13:54:41 +0100
 
 mame (0.141-1) experimental; urgency=low
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 14f6d6ba6c235606b98062ae7fa03f5fb77ce80f
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Mar 11 12:09:13 2011 +0100

Should not try to remove directories which are now created in $HOME/.mame/

diff --git a/debian/mame.postrm b/debian/mame.postrm
index b43e26e..7af640b 100644
--- a/debian/mame.postrm
+++ b/debian/mame.postrm
@@ -21,22 +21,15 @@ set -e
 # Liste des dossiers à supprimer lors de la désinstallation du paquet
 CLEAN_REP= \
 /usr/share/games/mame/roms \
-/usr/share/games/mame/samples \
 /usr/share/games/mame/artwork \
-/usr/share/games/lmame/ctrlr \
+/usr/share/games/mame/samples \
+/usr/share/games/mame/snap \
+/usr/share/games/mame/ctrlr \
 /usr/share/games/mame/cheat \
+/usr/share/games/mame/hash \
 /usr/share/games/mame \
-/var/games/mame/cfg \
-/var/games/mame/nvram \
-/var/games/mame/memcard \
-/var/games/mame/inp \
-/var/games/mame/sta \
-/var/games/mame/snap \
-/var/games/mame/diff \
-/var/games/mame/comments \
-/var/games/mame \
 /etc/mame \
-;
+
 
 case $1 in
   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit c6150c85fbe5353d672dac099c029d924e30421c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Mar 11 22:44:47 2011 +0100

Remove snap from mame.dirs and postrm as it lives now in $HOME

diff --git a/debian/mame.dirs b/debian/mame.dirs
index b5f9281..3db64aa 100644
--- a/debian/mame.dirs
+++ b/debian/mame.dirs
@@ -1,9 +1,10 @@
 usr/share/games/mame/roms
 usr/share/games/mame/artwork
 usr/share/games/mame/samples
-usr/share/games/mame/snap
 usr/share/games/mame/ctrlr
 usr/share/games/mame/cheat
 usr/share/games/mame/hash
+usr/share/games/mame/crosshair
+
 
 
diff --git a/debian/mame.postrm b/debian/mame.postrm
index 7af640b..26823e1 100644
--- a/debian/mame.postrm
+++ b/debian/mame.postrm
@@ -23,10 +23,10 @@ CLEAN_REP= \
 /usr/share/games/mame/roms \
 /usr/share/games/mame/artwork \
 /usr/share/games/mame/samples \
-/usr/share/games/mame/snap \
 /usr/share/games/mame/ctrlr \
 /usr/share/games/mame/cheat \
 /usr/share/games/mame/hash \
+/usr/share/games/mame/crosshair \
 /usr/share/games/mame \
 /etc/mame \
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 9a51c0a40952efc9259a324892277131037f5e1f
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Mar 13 18:10:24 2011 +0100

Add crosshair in list of system directories, remove snap

diff --git a/debian/mame.dirs b/debian/mame.dirs
index 3db64aa..842f527 100644
--- a/debian/mame.dirs
+++ b/debian/mame.dirs
@@ -1,10 +1,11 @@
-usr/share/games/mame/roms
 usr/share/games/mame/artwork
-usr/share/games/mame/samples
-usr/share/games/mame/ctrlr
 usr/share/games/mame/cheat
-usr/share/games/mame/hash
 usr/share/games/mame/crosshair
+usr/share/games/mame/ctrlr
+usr/share/games/mame/hash
+usr/share/games/mame/roms
+usr/share/games/mame/samples
+
 
 
 
diff --git a/debian/mame.lintian-overrides b/debian/mame.lintian-overrides
index 9ba0b28..b582baf 100644
--- a/debian/mame.lintian-overrides
+++ b/debian/mame.lintian-overrides
@@ -1,9 +1,9 @@
 # Allow empty folders for MAME
 # http://lintian.debian.org/manual/ch2.html
-mame binary: package-contains-empty-directory usr/share/games/mame/ctrlr/
-mame binary: package-contains-empty-directory usr/share/games/mame/snap/
-mame binary: package-contains-empty-directory usr/share/games/mame/cheat/
 mame binary: package-contains-empty-directory usr/share/games/mame/artwork/
-mame binary: package-contains-empty-directory usr/share/games/mame/roms/
-mame binary: package-contains-empty-directory usr/share/games/mame/samples/
+mame binary: package-contains-empty-directory usr/share/games/mame/cheat/
+mame binary: package-contains-empty-directory usr/share/games/mame/crosshair/
+mame binary: package-contains-empty-directory usr/share/games/mame/ctrlr/
 mame binary: package-contains-empty-directory usr/share/games/mame/hash/
+mame binary: package-contains-empty-directory usr/share/games/mame/roms/
+

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit cac18030aa22f7d4640b4f2b648b3bffd0d09056
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Mar 13 18:18:04 2011 +0100

Remove trailing whitespaces

diff --git a/debian/mame.dirs b/debian/mame.dirs
index 842f527..197a73b 100644
--- a/debian/mame.dirs
+++ b/debian/mame.dirs
@@ -5,7 +5,3 @@ usr/share/games/mame/ctrlr
 usr/share/games/mame/hash
 usr/share/games/mame/roms
 usr/share/games/mame/samples
-
-
-
-

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 9ac51e593c3623ab6806410ee7eb2bd50354fe65
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Mar 13 18:48:40 2011 +0100

Sort the list of directories to remove in alphabetic order

diff --git a/debian/mame.postrm b/debian/mame.postrm
index 26823e1..bf1f7b9 100644
--- a/debian/mame.postrm
+++ b/debian/mame.postrm
@@ -20,13 +20,13 @@ set -e
 
 # Liste des dossiers à supprimer lors de la désinstallation du paquet
 CLEAN_REP= \
-/usr/share/games/mame/roms \
 /usr/share/games/mame/artwork \
-/usr/share/games/mame/samples \
-/usr/share/games/mame/ctrlr \
 /usr/share/games/mame/cheat \
-/usr/share/games/mame/hash \
 /usr/share/games/mame/crosshair \
+/usr/share/games/mame/ctrlr \
+/usr/share/games/mame/hash \
+/usr/share/games/mame/roms \
+/usr/share/games/mame/samples \
 /usr/share/games/mame \
 /etc/mame \
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit e3f719c44f60d727af9aa80728338716b241
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Mar 13 18:49:32 2011 +0100

Add missing samples directory to list

diff --git a/debian/mame.lintian-overrides b/debian/mame.lintian-overrides
index b582baf..975d677 100644
--- a/debian/mame.lintian-overrides
+++ b/debian/mame.lintian-overrides
@@ -6,4 +6,4 @@ mame binary: package-contains-empty-directory 
usr/share/games/mame/crosshair/
 mame binary: package-contains-empty-directory usr/share/games/mame/ctrlr/
 mame binary: package-contains-empty-directory usr/share/games/mame/hash/
 mame binary: package-contains-empty-directory usr/share/games/mame/roms/
-
+mame binary: package-contains-empty-directory usr/share/games/mame/samples/

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-14 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 328b16a71a8ccc99babdc4a5c653e0b930644bff
Merge: e3f719c44f60d727af9aa80728338716b241 
47123c6cda91c28c9c2b1881f47f728538cf3118
Author: Emmanuel Kasper emman...@libera.cc
Date:   Mon Mar 14 16:56:43 2011 +0100

Merge branch 'master' of 
git+ssh://kdev-gu...@git.debian.org/git/pkg-games/mame


-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-22 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit d617c9db61a4ba14cfc83f81085343f9b2182226
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Mar 22 09:51:48 2011 +0100

Remove useless wget dependency

diff --git a/debian/control b/debian/control
index 56d0656..663c2a3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ XS-Autobuild: yes
 
 Package: mame
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wget
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: mame-tools
 Provides: xmame-common, xmame-sdl, xmame-svga, xmame-x
 Replaces: xmame-common ( 0.140-1), xmame-sdl ( 0.140-1), xmame-svga ( 
0.140-1), xmame-x ( 0.140-1)

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-24 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 4a75e1a9ddf15eba63353b99d06c316eb9635735
Author: Emmanuel Kasper emman...@libera.cc
Date:   Thu Mar 24 13:50:44 2011 +0100

Remove DISTRO makefile flag, to allows building with gcc-4.5

We used to have a DISTRO makefile which triggers particular build options
like gcc version and flag. This limited us in practise to gcc-4.4.
Now we use the default installed gcc which is the sanest practise IMHO.

diff --git a/debian/rules b/debian/rules
index e6667f6..faf3d30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,7 @@ DEB_MAME_OPTS = \
 VERBOSE= \
 OPTIMIZE=3 \
 LDFLAGS=-Wl,--as-needed \
-LDFLAGSEMULATOR=-Wl,--as-needed \
-DISTRO=gcc44-generic
+LDFLAGSEMULATOR=-Wl,--as-needed
 
 # Override make variables for specific archs
 ifeq ($(DEB_HOST_ARCH),i386)

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit aa350f7a7103dcc3cfc910fc56bd4015b7e00ded
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Mar 30 15:40:27 2011 +0200

Ignore quilt dir

diff --git a/.gitignore b/.gitignore
index 78827e1..5341921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ unidasm
 whatsnew.txt
 mame_0.139.orig.tar.gz
 mame_0.141.orig.tar.bz2
+.pc

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-03-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 681e5a449854bf55c71a42a48654c7574228999f
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Mar 30 16:52:50 2011 +0200

Subject: Fix usage file as shown when calling mame -h

diff --git a/debian/patches/fix-help-file.patch 
b/debian/patches/fix-help-file.patch
new file mode 100644
index 000..da5b405
--- /dev/null
+++ b/debian/patches/fix-help-file.patch
@@ -0,0 +1,15 @@
+From: Emmanuel Kasper emman...@libera.cc
+Subject: Fix usage file as shown when calling mame -h
+Forwarded: yes
+Bug: http://www.mametesters.org/view.php?id=4298
+--- a/src/emu/clifront.c
 b/src/emu/clifront.c
+@@ -342,7 +342,7 @@
+  MAME -showusagefor a brief list of options\n
+  MAME -showconfig   for a list of configuration 
options\n
+  MAME -createconfig to create a  CONFIGNAME 
.ini\n\n
+- For usage instructions, please consult the file 
windows.txt\n);
++ For usage instructions, please consult the file 
config.txt\n);
+ #else
+   mess_display_help();
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..9559f15
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-help-file.patch

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-04-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 6717cc9bbd9c192d297fe460a46d9fddab125914
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Apr 6 19:04:13 2011 +0200

Add make variables to build on GNU/kFreeBSD

diff --git a/debian/changelog b/debian/changelog
index f6bf903..bacfb45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mame (0.141-3) UNRELEASED; urgency=low
+
+  * Add make variables to build on GNU/kFreeBSD
+
+ -- Emmanuel Kasper emman...@libera.cc  Wed, 06 Apr 2011 18:52:56 +0200
+
 mame (0.141-2) experimental; urgency=low
 
   [ Emmanuel Kasper ]
diff --git a/debian/rules b/debian/rules
index faf3d30..c82704d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,22 @@ DEB_MAME_OPTS += \
 BIGENDIAN=1
 endif
 
+ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
+DEB_MAME_OPTS += \
+TARGETOS=freebsd \
+FORCE_DRC_C_BACKEND= \
+PTR64= \
+BIGENDIAN=
+endif
+
+ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
+DEB_MAME_OPTS += \
+TARGETOS=freebsd \
+PTR64=1 \
+FORCE_DRC_C_BACKEND= \
+BIGENDIAN=
+endif
+
 %:
dh $@
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-03 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b3f8401580b0ca7523cdfef771f27026adc4b929
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue May 3 23:25:43 2011 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 9034f7a..eda9022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mame (0.142-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Emmanuel Kasper emman...@libera.cc  Tue, 03 May 2011 22:01:06 +0200
+
 mame (0.141-3) unstable; urgency=low
 
   [ Emmanuel Kasper ]

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-03 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 6723135c86d156379df715d70c9fe34f29f798b7
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue May 3 23:26:07 2011 +0200

Remove jordi's patch from the series as it has been integrated upstream

diff --git a/debian/patches/series b/debian/patches/series
index 45d6b18..9559f15 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-help-file.patch
-fix_powerpc_build.patch

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-03 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 5854eb9ccdbe32e59aa051a297fbe61b2c399c7e
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue May 3 23:27:28 2011 +0200

Add NOWERROR=1 to stop treating warning as errors

Without these compilation fails with a lot of
array subscript is above array bounds messages

diff --git a/debian/rules b/debian/rules
index cc00b92..3e2e00a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,8 @@ DEB_MAME_OPTS = \
 VERBOSE= \
 OPTIMIZE=3 \
 LDFLAGS=-Wl,--as-needed \
-LDFLAGSEMULATOR=-Wl,--as-needed
+LDFLAGSEMULATOR=-Wl,--as-needed \
+NOWERROR=1
 
 # Override make variables for specific archs
 # Linux architectures

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-04 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit fa6f5c8ac1604dc910b23c0f14e6466fdaca
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed May 4 22:08:49 2011 +0200

Please read the changelog to get a changelog

diff --git a/debian/changelog b/debian/changelog
index eda9022..6dbc6f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 mame (0.142-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Set NOWERROR=1 to allow compiling with gcc-4.6
+  * Remove fix_powerpc_build.patch from the quilt serie, as upstream has took
+it in this release
 
  -- Emmanuel Kasper emman...@libera.cc  Tue, 03 May 2011 22:01:06 +0200
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-04 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b7db452ca0f81afefecf3e996c2e089ef1f0d549
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed May 4 22:24:14 2011 +0200

Update copyright to mame 0.142

diff --git a/debian/copyright b/debian/copyright
index adac77b..03f6ce4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=135
+Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=174
 Name: MAME
 Source: http://mamedev.org
 Disclaimer: 
@@ -11,13 +11,12 @@ XS-Autobuild: yes
 Files: debian/*
 Copyright: Ludovic Lechapt ludoma...@gmail.com
Mamedeb team mame...@googlegroups.com
-Based on Cesare Falco's package, and the previous xmame package.
 
 Files: debian/rules
 Copyright: Cesare Falco cesare.fa...@gmail.com
Ludovic Lechapt ludoma...@gmail.com
Mamedeb team mame...@googlegroups.com
-License: GPL-2
+License: GPL-2+
 
 Files: *
 Copyright: Nicola Salmoria and the MAME team
@@ -73,16 +72,54 @@ Files: src/emu/cpu/i860/*
 Copyright: Jason Eckhardt 
 License: MAME
 
-Files: src/emu/cpu/lr35902/*,
- src/emu/cpu/rsp/*,
- src/emu/cpu/z8/*,
- src/emu/machine/6526cia.h,
- src/emu/machine/cdp1852.h,
- src/emu/machine/i8255a.*,
- src/emu/machine/z80dart.*,
- src/emu/machine/z80sti.*,
- src/emu/sound/cdp1863.*,
- src/emu/sound/cdp1864.*
+Files: src/emu/video/crt9007.h,
+src/emu/video/crt9021.c,
+src/emu/video/crt9212.c,
+src/emu/video/msm6255.h,
+src/emu/video/crt9212.h,
+src/emu/video/msm6255.c,
+src/emu/video/crt9007.c,
+src/emu/video/hd61830.c,
+src/emu/video/crt9021.h,
+src/emu/video/hd61830.h,
+src/emu/softlist.c,
+src/emu/sound/cdp1864.c,
+src/emu/sound/cdp1869.h,
+src/emu/sound/cdp1863.h,
+src/emu/sound/cdp1863.c,
+src/emu/sound/cdp1864.h,
+src/emu/sound/sp0256.h,
+src/emu/sound/cdp1869.c,
+src/emu/machine/e0516.h,
+src/emu/machine/z8536.c,
+src/emu/machine/mc68901.h,
+src/emu/machine/z80sti.h,
+src/emu/machine/cdp1871.c,
+src/emu/machine/i8355.c,
+src/emu/machine/i8255a.h,
+src/emu/machine/z80sti.c,
+src/emu/machine/upd1990a.c,
+src/emu/machine/cdp1852.h,
+src/emu/machine/nmc9306.c,
+src/emu/machine/nmc9306.h,
+src/emu/machine/e0516.c,
+src/emu/machine/i8212.h,
+src/emu/machine/i8155.c,
+src/emu/machine/i8212.c,
+src/emu/machine/cdp1871.h,
+src/emu/machine/6526cia.h,
+src/emu/machine/ram.c,
+src/emu/machine/mc68901.c,
+src/emu/machine/i8355.h,
+src/emu/machine/i8155.h,
+src/emu/machine/upd1990a.h,
+src/emu/machine/z8536.h,
+src/emu/machine/i8255a.c,
+src/emu/cpu/cosmac/cosmac.h,
+src/emu/cpu/cosmac/cosmac.c,
+src/emu/cpu/z8/z8ops.c,
+src/emu/cpu/z8/z8.c,
+src/emu/cpu/z8/z8.h
 Copyright: The MESS team
 License: MAME
 
@@ -156,145 +193,264 @@ Files: src/emu/sound/ymf278b.*
 Copyright: R. Belmont and O. Galibert
 License: MAME or GPL-2
 
-Files: src/build/makedep.c,
-src/emu/addrmap.c,
-src/emu/addrmap.h,
-src/emu/cpu/adsp2100/adsp2100.c,
-src/emu/cpu/adsp2100/adsp2100.h,
-src/emu/cpu/asap/asap.c,
-src/emu/cpu/asap/asap.h,
-src/emu/debug/debugcpu.c,
-src/emu/debug/debugcpu.h,
-src/emu/debug/debugvw.c,
-src/emu/debug/debugvw.h,
-src/emu/debug/dvdisasm.c,
-src/emu/debug/dvdisasm.h,
-src/emu/debug/dvmemory.c,
-src/emu/debug/dvmemory.h,
-src/emu/debug/dvstate.c,
-src/emu/debug/dvstate.h,
-src/emu/debug/dvtext.c,
-src/emu/debug/dvtext.h,
-src/emu/delegate.c,
-src/emu/delegate.h,
-src/emu/devcpu.c,
-src/emu/devcpu.h,
-src/emu/devimage.c,
-src/emu/devintrf.c,
-src/emu/devintrf.h,
-src/emu/devlegcy.c,
-src/emu/devlegcy.h,
-src/emu/didisasm.c,
-src/emu/didisasm.h,
-src/emu/diexec.c,
-src/emu/diexec.h,
-src/emu/diimage.c,
-src/emu/diimage.h,
-src/emu/dimemory.c,
-src/emu/dimemory.h,
-src/emu/dinvram.c,
-src/emu/dinvram.h,
-src/emu/disound.c,
-src/emu/disound.h,
-src/emu/distate.c,
-src/emu/distate.h,
-src/emu/drivers/emudummy.c,
-src/emu/emualloc.c,
-src/emu/emualloc.h,
-src/emu/emu.h,
-src/emu/machine.c,
-src/emu/machine/er2055.c,
-src/emu/machine/er2055.h,
-src/emu/machine.h,
-src/emu/machine/nvram.c,
-src/emu/machine/nvram.h,
-src/emu/mconfig.c,
-src/emu/mconfig.h,
-src/emu/memory.c,
-src/emu/memory.h,
-src/emu/profiler.c,
-src/emu/profiler.h,
-src/emu/render.c,
-src/emu/render.h,
-src/emu/rendlay.c,
-src/emu/rendlay.h,
-src/emu/schedule.c,
-src/emu/schedule.h,
-src/emu/video.c,
-src/emu/video.h,
-src/emu/video/vooddefs.h,
-src/emu/video/voodoo.c,
-src/emu/video/voodoo.h,
-src/lib/util/*,
-src/mame/machine/atarigen.c,
-src/mame/machine/atarigen.h,
-src/osd/osdcomm.h,
-src/osd/osdcore.h,
-src/osd/osdepend.h,
-src/osd/osdmini/minidir.c,
-src/osd/osdmini/minifile.c,
-src/osd/osdmini/minimain.c,
-src/osd/osdmini/minimisc.c,
-src/osd/osdmini/minisync.c,
-src/osd/osdmini/minitime.c,
-src/osd/osdmini/miniwork.c,
-src/osd/osdmini/osdmini.mak,
-src/osd/windows/d3d8intf.c,
-src/osd/windows/d3d9intf.c,
-src/osd/windows/d3dintf.h,
-src/osd/windows/debugwin.c,
-src/osd/windows/debugwin.h,
+Files: src/osd/osdepend.c,
 src/osd/windows/drawd3d.c

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

2011-05-04 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 93cafd3b9a7158e0d7918bf58240ffd6aac27454
Merge: b7db452ca0f81afefecf3e996c2e089ef1f0d549 
3715dc95f920faad38d4f129d68b6e68b3c2b55b
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed May 4 22:36:32 2011 +0200

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


-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 2127a0c8f35e3763743a3ff90cdaf6c29b802a60
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat May 7 01:21:06 2011 +0200

Update doc according to new mame.ini installation

diff --git a/debian/README.Debian b/debian/README.Debian
index b7f8fb6..0d6def1 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -51,7 +51,7 @@ in the Mame configuration file.
 
 == ROMS AND CONFIGURATION ==
 
-An initial configuration file is created during the first package installation
+A default configuration file is provided with the package and installed 
 in /etc/mame/mame.ini
 
 If you need to change the location of the roms folder or tweak something like 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 5a69e2c103a193dc2b08063672c5961bcfc8641c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat May 7 01:22:30 2011 +0200

Included the new hash files provided for the sega megatech

diff --git a/debian/mame.install b/debian/mame.install
index a829b5c..6e93736 100644
--- a/debian/mame.install
+++ b/debian/mame.install
@@ -6,3 +6,5 @@ debian/install/mame.xpm usr/share/pixmaps
 debian/install/mame.desktopusr/share/applications
 
 debian/mame.inietc/mame
+
+hash/* usr/share/games/mame/hash
diff --git a/debian/mame.lintian-overrides b/debian/mame.lintian-overrides
index 975d677..c9bd942 100644
--- a/debian/mame.lintian-overrides
+++ b/debian/mame.lintian-overrides
@@ -4,6 +4,5 @@ mame binary: package-contains-empty-directory 
usr/share/games/mame/artwork/
 mame binary: package-contains-empty-directory usr/share/games/mame/cheat/
 mame binary: package-contains-empty-directory usr/share/games/mame/crosshair/
 mame binary: package-contains-empty-directory usr/share/games/mame/ctrlr/
-mame binary: package-contains-empty-directory usr/share/games/mame/hash/
 mame binary: package-contains-empty-directory usr/share/games/mame/roms/
 mame binary: package-contains-empty-directory usr/share/games/mame/samples/

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit dd4d2912202134b4b58f32ad4a58b1b7ca167534
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat May 7 01:31:51 2011 +0200

Replace Ludo'S adress with the mame PTS address

diff --git a/debian/rules b/debian/rules
index 3e2e00a..58e3663 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 
's/^Version: \(.*\)-.*/\1/p')
 
 FILEBASE = $(PACKAGE)$(VERSION)
 URL = http://mamedev.org/downloader.php?file=releases/
-AGENT = Debian package ludoma...@gmail.com
+AGENT = Debian package m...@packages.qa.debian.org
 TMPDIR := $(shell mktemp --dry-run --directory -p .)
 
 # Upstream zip file does not have a dot in its name, so we have to cut it out

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 76ee1cea52a9f60368b6fc535993ac011956905f
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat May 7 01:33:02 2011 +0200

changelog

diff --git a/debian/changelog b/debian/changelog
index 6dbc6f7..a647d06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mame (0.142-1) UNRELEASED; urgency=low
   * Set NOWERROR=1 to allow compiling with gcc-4.6
   * Remove fix_powerpc_build.patch from the quilt serie, as upstream has took
 it in this release
+  * Add gnome-video-arcade front end as a suggested package
 
  -- Emmanuel Kasper emman...@libera.cc  Tue, 03 May 2011 22:01:06 +0200
 

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 7b0541dd055259145d12946680b567feccbac88c
Merge: 76ee1cea52a9f60368b6fc535993ac011956905f 
6b88d96fa27695678655e63440b85cba85999ac9
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat May 7 01:51:14 2011 +0200

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


-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-10 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit ad5c39d12fea4d4ffb79e5edb6b96da4d35dface
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue May 10 20:24:49 2011 +0200

Updated email adress to m...@packages.debian.org

diff --git a/debian/copyright b/debian/copyright
index 03f6ce4..c9b3451 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ Copyright: Ludovic Lechapt ludoma...@gmail.com
 Files: debian/rules
 Copyright: Cesare Falco cesare.fa...@gmail.com
Ludovic Lechapt ludoma...@gmail.com
-   Mamedeb team mame...@googlegroups.com
+   Mamedeb team m...@packages.debian.org
 License: GPL-2+
 
 Files: *

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-10 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 96d7594e50a28d732c452170a35c1fad6ed969a7
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue May 10 20:26:09 2011 +0200

Updated email adress to m...@packages.debian.org

diff --git a/debian/copyright b/debian/copyright
index c9b3451..3236393 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ XS-Autobuild: yes
 
 Files: debian/*
 Copyright: Ludovic Lechapt ludoma...@gmail.com
-   Mamedeb team mame...@googlegroups.com
+   Mamedeb team m...@packages.debian.org
 
 Files: debian/rules
 Copyright: Cesare Falco cesare.fa...@gmail.com

-- 
packaging for the mame arcade game emulator

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits


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

2011-05-27 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 87d532e3fd0dbda2c2b628f58479b5f6b45c19e1
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri May 27 11:10:00 2011 +0200

Remove symlinking to megatech.xml: it is a mame file, not a mess one

diff --git a/debian/rules b/debian/rules
index 9484306..a734a98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,8 +132,6 @@ override_dh_auto_build:
# component directory to enable its build.
[ -d mess ]  mv mess messdir
[ -d hash ]  mv hash hash.mame
-   [ ! -L messdir/hash/megatech.xmk ]  \
- ln -s ../../hash.mame/megatech.xml messdir/hash
[ ! -L hash ]  ln -s messdir/hash hash
[ ! -L artwork ]  ln -s messdir/artwork artwork
[ ! -L sysinfo.dat ]  ln -s messdir/sysinfo.dat sysinfo.dat
@@ -153,7 +151,6 @@ override_dh_auto_clean:
[ ! -L hash ] || rm hash
[ ! -L sysinfo.dat ] || rm sysinfo.dat
[ ! -L src/mess ] || rm src/mess
-   [ ! -L messdir/hash/megatech.xml ] || rm messdir/hash/megatech.xml
[ ! -d hash.mame ] || mv hash.mame hash
[ ! -d messdir ] || mv messdir mess
 

-- 
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


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

2011-05-27 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 4ff12cb9744d8664ed28061a7b11c65ede39c1ea
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri May 27 11:49:19 2011 +0200

Test if generated ini files exist before removing them with clean target

diff --git a/debian/rules b/debian/rules
index a734a98..f93102e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,7 +145,8 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
$(MAKE) $(DEB_MAME_OPTS) clean
-   -rm default.mame.ini default.mess.ini
+   [ ! -f default.mame.ini ] || rm default.mame.ini
+   [ ! -f default.mess.ini ] || rm default.mess.ini
# Undo MESS modifications.
[ ! -L artwork ] || rm artwork
[ ! -L hash ] || rm hash

-- 
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


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

2011-05-27 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit dbe2e3caddba1f0f638df34b69d336e5dd066d35
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri May 27 11:55:43 2011 +0200

Add missing call to make clean for mess

diff --git a/debian/rules b/debian/rules
index f93102e..a296398 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,6 +145,7 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
$(MAKE) $(DEB_MAME_OPTS) clean
+   $(MAKE) $(DEB_MESS_OPTS) clean
[ ! -f default.mame.ini ] || rm default.mame.ini
[ ! -f default.mess.ini ] || rm default.mess.ini
# Undo MESS modifications.

-- 
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


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

2011-05-28 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 458895f8b51375faf2912d1c7d2e4249454078dd
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat May 28 14:28:54 2011 +0200

Add failover for mess in case in call debian/rules clean in a clean dir

diff --git a/debian/rules b/debian/rules
index a296398..728b4dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,6 +145,9 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
$(MAKE) $(DEB_MAME_OPTS) clean
+   # failover to find a mess makefile in case we start from a clean dir
+   [ -d mess ]  mv mess messdir
+   [ ! -L src/mess ]  ln -s ../messdir/src/mess src/mess
$(MAKE) $(DEB_MESS_OPTS) clean
[ ! -f default.mame.ini ] || rm default.mame.ini
[ ! -f default.mess.ini ] || rm default.mess.ini

-- 
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


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

2011-06-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 8e2e00a0cc61dc60b564d83410cc95639e628b75
Author: Emmanuel Kasper emman...@libera.cc
Date:   Thu Jun 2 13:17:22 2011 +0200

Add necessary entries for MESS

diff --git a/debian/copyright b/debian/copyright
index 3236393..4318228 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,11 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=filerev=174
-Name: MAME
-Source: http://mamedev.org
+Format-Specification: http://dep.debian.net/deps/dep5/
+Upstream-Name: MAME
+Source: http://mamedev.org and http://mess.redump.net. The mess source code is 
a source code layer which is added to the mame source code for building.
 Disclaimer: 
  This package is not part of the GNU/Linux Debian distribution.  It is
  provided in the non-free archive area as a convenience to Debian users.
  The contents of this package cannot be distributed as part of the Debian
  distribution because the Mame Software License does not allow commercial use.
-XS-Autobuild: yes
 
 Files: debian/*
 Copyright: Ludovic Lechapt ludoma...@gmail.com
@@ -642,6 +641,80 @@ Files: src/osd/sdl/SDL1211_opengl.h
 Copyright: Sam Lantinga
 License: LGPL-2.1
 
+Files: mess/src/*
+Copyright: MESS Team
+License: MAME
+
+Files: mess/src/osd/winui/*
+Copyright: Michael Soderstrom, Chris Kirmse, MAME32/MAMEUI team
+License: MAME
+
+Files: mess/src/osd/winui/winui.mak,
+mess/tiny.mak
+License: MAME
+Copyright: Nicola Salmoria and the MAME team
+
+Files: mess/src/mess/video/hp48.c,
+mess/src/mess/video/thomson.c,
+mess/src/mess/formats/thom_cas.h,
+mess/src/mess/formats/thom_cas.c,
+mess/src/mess/tools/imgtool/modules/thomson.c,
+mess/src/mess/includes/thomson.h,
+mess/src/mess/includes/hp48.h,
+mess/src/mess/drivers/hp48.c,
+mess/src/mess/drivers/thomson.c,
+mess/src/mess/audio/mea8000.h,
+mess/src/mess/audio/mea8000.c,
+mess/src/mess/machine/mc6846.h,
+mess/src/mess/machine/thomflop.h,
+mess/src/mess/machine/thomflop.c,
+mess/src/mess/machine/mc6846.c,
+mess/src/mess/machine/hp48.c,
+mess/src/mess/machine/thomson.c,
+mess/src/mess/machine/mc6854.h,
+mess/src/mess/machine/mc6843.h,
+mess/src/mess/machine/mc6843.c,
+mess/src/mess/machine/mc6854.c
+License: MAME
+Copyright: Antoine Mine
+
+Files: mess/src/osd/windows/mess.rc
+Copyright: Aaron Giles
+License: BSD-3-clause
+
+Files: mess/src/mess/video/vic6567.c
+Copyright: Christian Bauer
+License:
+The rights on the source code remain at the author.
+It may not - not even in parts - used for commercial purposes without explicit
+written permission by the author.
+Permission to use it for non-commercial purposes is hereby granted als long as
+my copyright notice remains in the program.
+You are not allowed to use the source to create and distribute a modified
+version of Frodo.
+
+Files: mess/src/mess/video/pc1403.c
+Copyright: Peter Trauner
+License:
+ *   Copyright (c) 2001 Peter Trauner, all rights reserved.
+ *
+ *   - This source code is released as freeware for non-commercial purposes.
+ *   - You are free to use and redistribute this code in modified or
+ * unmodified form, provided you list me in the credits.
+ *   - If you modify this source code, you must add a notice to each modified
+ * source file that it has been changed.  If you're a nice person, you
+ * will clearly mark each change too.  :)
+ *   - If you wish to use this for commercial purposes, please contact me at
+ * peter.trau...@jk.uni-linz.ac.at
+ *   - The author of this copywritten work reserves the right to change the
+ * terms of its usage and license at any time, including retroactively
+ *   - This entire notice must remain in the source code.
+
+Files: mess/src/mess/machine/msx.c,
+mess/src/mess/machine/msx_slot.c
+Copyright: Sean Young
+License: MAME
+
 License: MAME
  Copyright (c) 1997-2007, Nicola Salmoria and the MAME team
  All rights reserved.

-- 
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


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

2011-06-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit d12f92e7a91ae31dd8209843346298cefa13c9b3
Author: Emmanuel Kasper emman...@libera.cc
Date:   Thu Jun 2 13:45:05 2011 +0200

Correct default copyright assignment for mess source code to 
Salmoria/Mameteam

diff --git a/debian/copyright b/debian/copyright
index 4318228..3adac7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -642,18 +642,13 @@ Copyright: Sam Lantinga
 License: LGPL-2.1
 
 Files: mess/src/*
-Copyright: MESS Team
+Copyright: Nicola Salmoria and the MAME team
 License: MAME
 
 Files: mess/src/osd/winui/*
 Copyright: Michael Soderstrom, Chris Kirmse, MAME32/MAMEUI team
 License: MAME
 
-Files: mess/src/osd/winui/winui.mak,
-mess/tiny.mak
-License: MAME
-Copyright: Nicola Salmoria and the MAME team
-
 Files: mess/src/mess/video/hp48.c,
 mess/src/mess/video/thomson.c,
 mess/src/mess/formats/thom_cas.h,
@@ -686,10 +681,8 @@ Files: mess/src/mess/video/vic6567.c
 Copyright: Christian Bauer
 License:
 The rights on the source code remain at the author.
-It may not - not even in parts - used for commercial purposes without explicit
-written permission by the author.
-Permission to use it for non-commercial purposes is hereby granted als long as
-my copyright notice remains in the program.
+It may not - not even in parts - used for commercial purposes without explicit 
written permission by the author.
+Permission to use it for non-commercial purposes is hereby granted als long as 
my copyright notice remains in the program.
 You are not allowed to use the source to create and distribute a modified
 version of Frodo.
 
@@ -715,6 +708,11 @@ mess/src/mess/machine/msx_slot.c
 Copyright: Sean Young
 License: MAME
 
+Files: mess/src/mess/tools/imgtool/modules/xsa.c
+Copyright: Nicola Salmoria and the MAME team
+License: MAME
+uses XSA code developed by Alex Wulms/XelaSoft.
+
 License: MAME
  Copyright (c) 1997-2007, Nicola Salmoria and the MAME team
  All rights reserved.

-- 
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


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

2011-06-07 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit f8d8bce3a834addb8b5fa998e28e2c07d6860075
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jun 7 23:56:24 2011 +0200

Fix to make debian/rules clean work in all cases, from a clean or
non-clean workdir

diff --git a/debian/rules b/debian/rules
index 728b4dd..860d936 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,10 +145,8 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
$(MAKE) $(DEB_MAME_OPTS) clean
-   # failover to find a mess makefile in case we start from a clean dir
-   [ -d mess ]  mv mess messdir
-   [ ! -L src/mess ]  ln -s ../messdir/src/mess src/mess
-   $(MAKE) $(DEB_MESS_OPTS) clean
+   # target may fail if the symlinks have not been created
+   -$(MAKE) $(DEB_MESS_OPTS) clean
[ ! -f default.mame.ini ] || rm default.mame.ini
[ ! -f default.mess.ini ] || rm default.mess.ini
# Undo MESS modifications.

-- 
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


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

2011-06-07 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit ab0d5d39a4c9ceebe7fcf892cb576fa3fa90b616
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jun 8 00:35:01 2011 +0200

Remove executable bit from mess hash files

diff --git a/debian/changelog b/debian/changelog
index 7849201..41e30c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ mame (0.142-2) UNRELEASED; urgency=low
 - manpages for mess, castool and imgtool
 
   [ Emmanuel Kasper ]
+  * Remove executable bit set by windows on all mess hash files 
   * Fix clean rule on a clean tree.
   * Add copyright information for MESS sources.
   * Remove symlinking of megatech.xml.

-- 
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


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

2011-06-07 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit d1f1b58f43a4e33df219b1c19cd00e9084deeb9d
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jun 7 23:51:31 2011 +0200

Commented out non-working watch file for mess

( it tries to download an older release )

diff --git a/debian/watch b/debian/watch
index 2f935dd..890be1a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
 version=3
 opts=dversionmangle=s/u\d+// \
  http://mamedev.org/release.html .*mame(\d)(\d+)s.zip
-opts=dversionmangle=s/u\d+// \
- http://www.mess.org/download.php .*mess(\d)(\d+)s.zip
+# Commented out: it tries to download mess0621s.zip which is older
+#opts=dversionmangle=s/u\d+// \
+# http://www.mess.org/download.php .*mess(\d)(\d+)s.zip

-- 
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


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

2011-06-07 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit d7c4914a84fb10303548a2820c2381204cd6a5fd
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jun 7 23:48:49 2011 +0200

Remove commented lines, we have now a VCS for history

diff --git a/debian/watch b/debian/watch
index c10e27d..2f935dd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,5 @@
 version=3
-#opts=dversionmangle=s/u\d+//,filenamemangle=s/.*\/(.*)/$1/ \
 opts=dversionmangle=s/u\d+// \
  http://mamedev.org/release.html .*mame(\d)(\d+)s.zip
-#opts=dversionmangle=s/u\d+//,filenamemangle=s/.*\/(.*)/$1/ \
 opts=dversionmangle=s/u\d+// \
  http://www.mess.org/download.php .*mess(\d)(\d+)s.zip

-- 
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


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

2011-06-15 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 0028b61d61699b3d306ca2d9832ac800615b6f83
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jun 15 21:54:56 2011 +0200

Correct mame hash files sources, as hash/* contains the mess hash files

diff --git a/debian/mame.install b/debian/mame.install
index f288c62..10dff00 100644
--- a/debian/mame.install
+++ b/debian/mame.install
@@ -2,5 +2,5 @@ mame usr/games
 debian/install/mame.xpm usr/share/pixmaps
 debian/install/mame.desktop usr/share/applications
 debian/mame.ini etc/mame
-hash/* usr/share/games/mame/hash
+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


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

2011-06-21 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 2e8adcd619170dbf019b5acf2913aee0a63900a2
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sat Jun 18 13:52:22 2011 +0200

Move mess dir preparation to separate target

It allows to restart an interrupted `debian/rules build` without fuss

diff --git a/debian/rules b/debian/rules
index 177e114..d9d7aa7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,7 +125,7 @@ endif
 %:
dh $@
 
-override_dh_auto_build:
+prepare_mess_dirs:
# MESS is an overlay of the MAME source code, but we need to have
# the code in a mess directory, as that's how dpkg components
# work. Move dirs and create symlinks for MESS stuff outside its
@@ -136,6 +136,9 @@ override_dh_auto_build:
[ ! -L artwork ]  ln -s messdir/artwork artwork
[ ! -L sysinfo.dat ]  ln -s messdir/sysinfo.dat sysinfo.dat
[ ! -L src/mess ]  ln -s ../messdir/src/mess src/mess
+   touch $@
+
+override_dh_auto_build: prepare_mess_dirs
$(MAKE) -j3 $(DEB_MAME_OPTS) all
$(CURDIR)/mame -createconfig
mv mame.ini default.mame.ini
@@ -155,6 +158,7 @@ override_dh_auto_clean:
  clean
# target may fail if the symlinks have not been created
-$(MAKE) $(DEB_MESS_OPTS) clean
+   -rm prepare_mess_dirs
[ ! -f default.mame.ini ] || rm default.mame.ini
[ ! -f default.mess.ini ] || rm default.mess.ini
# Undo MESS modifications.

-- 
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


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

2011-06-25 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 8eabe0ebc42db2a00618b398e752ea13feb6ba9e
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Jun 24 02:31:24 2011 +0200

Add README.Debian for the mess binary package.

diff --git a/debian/changelog b/debian/changelog
index 41e30c7..3db25cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ mame (0.142-2) UNRELEASED; urgency=low
   * Fix clean rule on a clean tree.
   * Add copyright information for MESS sources.
   * Remove symlinking of megatech.xml.
+  * Add README.Debian for the mess binary package.
 
  -- Jordi Mallach jo...@debian.org  Thu, 12 May 2011 16:37:27 +0200
 

-- 
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


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

2011-06-28 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit cc9eeba6e749e9e33d0a59bce5e078ed6fc37d81
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jun 28 22:39:18 2011 +0200

Move the 67M of artwork and hash files to a mess-data arch-indep package

diff --git a/debian/control b/debian/control
index d6a1f17..f9b40bb 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: Tools for Multiple Arcade Machine Emulator (MAME)
 
 Package: mess
 Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 powerpc s390
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, mess-data
 Recommends: mess-desktop-entries
 Suggests: mame-tools
 Provides: xmess-common, xmess-sdl, xmess-x
@@ -82,6 +82,21 @@ Description: Multi Emulator Super System (MESS)
  .
  This package provides the MESS binary and configuration files.
 
+Package: mess-data
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Multi Emulator Super System (MESS)
+ MESS is an emulator for various consoles and computing systems, sharing a
+ lot of codebase with the MAME project.
+ .
+ Some of the well known consoles and computers emulated are the Atari 2600,
+ Lynx, NES, SNES, Nintendo 64, GameBoy, Sega Master System, Sega Megadrive,
+ Game Gear, Colecovision, Vectrex, Apple II, Atari 400/800, Commodore 64/128,
+ IBM PC XT and AT (MDA and CGA), ZX80, ZX Spectrum, TI99/4, TRS-80, and the
+ MSX.
+ .
+ This package provides the MESS hash files, keymaps and artwork.
+
 Package: xmame-sdl
 Depends: mame, ${misc:Depends}
 Architecture: all
diff --git a/debian/mess.install b/debian/mess-data.install
similarity index 82%
copy from debian/mess.install
copy to debian/mess-data.install
index 55fb183..ee3b3b2 100644
--- a/debian/mess.install
+++ b/debian/mess-data.install
@@ -1,5 +1,3 @@
-mess usr/games
-debian/mess.ini etc/mess
 messdir/artwork/* usr/share/games/mess/artwork
 messdir/hash/* usr/share/games/mess/hash
 messdir/sysinfo.dat usr/share/games/mess
diff --git a/debian/mess.install b/debian/mess.install
index 55fb183..d7481e1 100644
--- a/debian/mess.install
+++ b/debian/mess.install
@@ -1,6 +1,3 @@
 mess usr/games
 debian/mess.ini etc/mess
-messdir/artwork/* usr/share/games/mess/artwork
-messdir/hash/* usr/share/games/mess/hash
-messdir/sysinfo.dat usr/share/games/mess
-src/osd/sdl/keymaps/*.txt usr/share/games/mess/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


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

2011-06-28 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 0f397a166301ab81072196101c8fa3e5dff1c9c0
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jun 28 22:45:53 2011 +0200

Create a mess-data package for mess architecture independant files

diff --git a/debian/changelog b/debian/changelog
index 3db25cd..c179d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ mame (0.142-2) UNRELEASED; urgency=low
   * Add copyright information for MESS sources.
   * Remove symlinking of megatech.xml.
   * Add README.Debian for the mess binary package.
+  * Create a mess-data package for mess architecture independant files
 
  -- Jordi Mallach jo...@debian.org  Thu, 12 May 2011 16:37:27 +0200
 

-- 
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


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

2011-06-28 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 8ca381ede79bc1cf8de0b47c194ca9c86de95a39
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jun 29 00:27:21 2011 +0200

Typo

diff --git a/debian/changelog b/debian/changelog
index c179d2a..fabe7c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,7 +35,7 @@ mame (0.142-2) UNRELEASED; urgency=low
   * Add copyright information for MESS sources.
   * Remove symlinking of megatech.xml.
   * Add README.Debian for the mess binary package.
-  * Create a mess-data package for mess architecture independant files
+  * Create a mess-data package for mess architecture independent files
 
  -- Jordi Mallach jo...@debian.org  Thu, 12 May 2011 16:37:27 +0200
 

-- 
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


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

2011-07-05 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit ddfc4005d90722e6dbd2039dd173cf6a1e3551b6
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jul 5 16:20:56 2011 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index fabe7c0..9da3b57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mame (0.143-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Emmanuel Kasper emman...@libera.cc  Tue, 05 Jul 2011 16:12:30 +0200
+
 mame (0.142-2) UNRELEASED; urgency=low
 
   * Add the necessary variables to fix s390 and sparc builds (they are big

-- 
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


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

2011-07-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 58dd969db0caa5098c5bb008f580401ee9128742
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jul 6 11:01:32 2011 +0200

Move out Mame artwork to make room for mess

diff --git a/debian/rules b/debian/rules
index 9ed75aa..ca9a7ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,6 +132,7 @@ prepare_mess_dirs:
# component directory to enable its build.
[ -d mess ]  mv mess messdir
[ -d hash ]  mv hash hash.mame
+   [ -d artwork ]  mv artwork artwork.mame
[ ! -L hash ]  ln -s messdir/hash hash
[ ! -L artwork ]  ln -s messdir/artwork artwork
[ ! -L sysinfo.dat ]  ln -s messdir/sysinfo.dat sysinfo.dat
@@ -167,6 +168,7 @@ override_dh_auto_clean:
[ ! -L sysinfo.dat ] || rm sysinfo.dat
[ ! -L src/mess ] || rm src/mess
[ ! -d hash.mame ] || mv hash.mame hash
+   [ ! -d artwork.mame ] || mv hash.mame
[ ! -d messdir ] || mv messdir mess
 
 # dh_installchangelogs doesn't know about whatsnew.txt,

-- 
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


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

2011-07-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit d169f30a2f14371a252867c9385be9f8f4d06045
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jul 6 12:26:46 2011 +0200

Remove ldplayer build target: useless, breaks too often

diff --git a/debian/control b/debian/control
index f9b40bb..92c2064 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,6 @@ Description: Tools for Multiple Arcade Machine Emulator (MAME)
   imgtool -- generic image manipulation tool for MESS
   jedutil -- binary to/from JEDEC file converter
   ldresample -- Laserdisc audio synchronizer and resampler
-  ldplayer -- Laserdisc dump player
   ldverify -- Laserdisc AVI/CHD verifier
   romcmp -- ROM comparison utility program
   testkeys -- keyboard code viewer
diff --git a/debian/mame-tools.install b/debian/mame-tools.install
index 9b404eb..cc3a586 100644
--- a/debian/mame-tools.install
+++ b/debian/mame-tools.install
@@ -2,7 +2,6 @@ castool usr/bin/
 chdman usr/bin/
 imgtool usr/bin/
 jedutil usr/bin/
-ldplayer usr/bin/
 ldresample usr/bin/
 ldverify usr/bin/
 romcmp usr/bin/
diff --git a/debian/mame-tools.manpages b/debian/mame-tools.manpages
index 3347e77..adb6433 100644
--- a/debian/mame-tools.manpages
+++ b/debian/mame-tools.manpages
@@ -3,7 +3,6 @@ debian/man/imgtool.1
 debian/man/ldresample.1
 src/osd/sdl/man/chdman.1
 src/osd/sdl/man/jedutil.1
-src/osd/sdl/man/ldplayer.1
 src/osd/sdl/man/ldverify.1
 src/osd/sdl/man/romcmp.1
 src/osd/sdl/man/testkeys.1
diff --git a/debian/rules b/debian/rules
index ca9a7ec..96fa1f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,9 +143,6 @@ override_dh_auto_build: prepare_mess_dirs
$(MAKE) -j3 $(DEB_MAME_OPTS) all
$(CURDIR)/mame -createconfig
mv mame.ini default.mame.ini
-   $(MAKE) -j3 $(DEB_MAME_OPTS) TARGET=ldplayer \
- FULLNAME=ldplayer \
- SUBTARGET=ldplayer
$(MAKE) -j3 $(DEB_MESS_OPTS) all
$(CURDIR)/mess -createconfig
mv mess.ini default.mess.ini
@@ -153,10 +150,6 @@ override_dh_auto_build: prepare_mess_dirs
 override_dh_auto_clean:
echo Starting clean process...
$(MAKE) $(DEB_MAME_OPTS) clean
-   $(MAKE) $(DEB_MAME_OPTS) TARGET=ldplayer \
- FULLNAME=ldplayer \
- SUBTARGET=ldplayer \
- clean
# target may fail if the symlinks have not been created
-$(MAKE) $(DEB_MESS_OPTS) clean
-rm prepare_mess_dirs
@@ -168,7 +161,7 @@ override_dh_auto_clean:
[ ! -L sysinfo.dat ] || rm sysinfo.dat
[ ! -L src/mess ] || rm src/mess
[ ! -d hash.mame ] || mv hash.mame hash
-   [ ! -d artwork.mame ] || mv hash.mame
+   [ ! -d artwork.mame ] || mv artwork.mame artwork
[ ! -d messdir ] || mv messdir mess
 
 # dh_installchangelogs doesn't know about whatsnew.txt,

-- 
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


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

2011-07-06 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit c63539b59b9d392a6c765e4bf295d0207a795349
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jul 6 16:15:58 2011 +0200

Remove typo patches ( don't apply anymore ) and fix_help ( fixed upstream )

diff --git a/debian/patches/series b/debian/patches/series
index ea5c6c0..c021073 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-fix-help-file.patch
-mess_typos.patch
-mame_typos.patch
 fix_mame_manpage_section.patch

-- 
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


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

2011-07-11 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit afb2595e03570acefbdad2bfc034a3fd15736452
Author: Emmanuel Kasper emman...@libera.cc
Date:   Mon Jul 11 15:29:14 2011 +0200

Re enable joystick support as default

diff --git a/debian/mame.ini b/debian/mame.ini
index b82aeaf..54b0458 100644
--- a/debian/mame.ini
+++ b/debian/mame.ini
@@ -30,5 +30,4 @@ comment_directory$HOME/.mame/comments
 videosoft
 # Set multithreading to '1' if you have more than one core
 multithreading   0
-# Set joystick to 1 if you have a joystick available
-joystick 0
+
diff --git a/debian/mess.ini b/debian/mess.ini
index 09fc95e..9dfc37d 100644
--- a/debian/mess.ini
+++ b/debian/mess.ini
@@ -30,5 +30,4 @@ comment_directory$HOME/.mess/comments
 videosoft
 # Set multithreading to '1' if you have more than one core
 multithreading   0
-# Set joystick to 1 if you have a joystick available
-joystick 0
+

-- 
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


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

2011-07-11 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 4fe92b6dfc4e2f3e4922f524f637e99ef62ee00e
Author: Emmanuel Kasper emman...@libera.cc
Date:   Mon Jul 11 21:12:38 2011 +0200

Start by default in windowed mode ( Recommended by pkg-games team)

diff --git a/debian/changelog b/debian/changelog
index 86f0b30..4fbdfd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,12 @@ mame (0.143-1) UNRELEASED; urgency=low
 
   [ Emmanuel Kasper ]
   * New upstream release
+  * Start by default in windowed mode
 
   [ Félix Arreola Rodríguez ]
   * Remove kfreebsd-build.patch (fixed upstream)
 
- -- Félix Arreola Rodríguez fgatuno@gmail.com  Wed, 06 Jul 2011 11:29:23 
-0500
+ -- Emmanuel Kasper emman...@libera.cc  Mon, 11 Jul 2011 21:10:32 +0200
 
 mame (0.142-2) UNRELEASED; urgency=low
 
diff --git a/debian/mame.ini b/debian/mame.ini
index 54b0458..7740c5c 100644
--- a/debian/mame.ini
+++ b/debian/mame.ini
@@ -30,4 +30,5 @@ comment_directory$HOME/.mame/comments
 videosoft
 # Set multithreading to '1' if you have more than one core
 multithreading   0
-
+# Set nowindow to 0 if you want MAME to start fullscreen
+nowindow 1
diff --git a/debian/mess.ini b/debian/mess.ini
index 9dfc37d..5f7ed6d 100644
--- a/debian/mess.ini
+++ b/debian/mess.ini
@@ -30,4 +30,5 @@ comment_directory$HOME/.mess/comments
 videosoft
 # Set multithreading to '1' if you have more than one core
 multithreading   0
-
+# Set nowindow to 0 if you want MESS to start fullscreen
+nowindow 1

-- 
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

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

2011-07-12 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit d66ab69f2d98d0c6a3b015e6fc606e0b8e12ac1e
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jul 12 17:39:13 2011 +0200

Update copyright file for mame and mess 0.143

diff --git a/debian/copyright b/debian/copyright
index 3adac7e..55e35c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -118,7 +118,77 @@ src/emu/cpu/cosmac/cosmac.h,
 src/emu/cpu/cosmac/cosmac.c,
 src/emu/cpu/z8/z8ops.c,
 src/emu/cpu/z8/z8.c,
-src/emu/cpu/z8/z8.h
+src/emu/cpu/z8/z8.h,
+src/emu/machine/6525tpi.c,
+src/emu/machine/adc0808.c,
+src/emu/machine/adc0808.h,
+src/emu/machine/com8116.c,
+src/emu/machine/com8116.h,
+src/emu/machine/ctronics.c,
+src/emu/machine/i8214.c,
+src/emu/machine/i8214.h,
+src/emu/machine/i8255.c,
+src/emu/machine/i8255.h,
+src/emu/machine/mc6852.c,
+src/emu/machine/mc6852.h,
+src/emu/machine/mccs1850.c,
+src/emu/machine/mccs1850.h,
+src/emu/machine/mm74c922.c,
+src/emu/machine/mm74c922.h,
+src/emu/machine/mos6529.c,
+src/emu/machine/mos6529.h,
+src/emu/machine/msm5832.c,
+src/emu/machine/msm5832.h,
+src/emu/machine/msm58321.c,
+src/emu/machine/msm58321.h,
+src/emu/machine/rp5c01.c,
+src/emu/machine/rp5c01.h,
+src/emu/machine/rp5c15.c,
+src/emu/machine/rp5c15.h,
+src/emu/machine/upd7201.c,
+src/emu/machine/upd7201.h,
+src/emu/machine/wd17xx.c,
+src/emu/sound/lmc1992.c,
+src/emu/sound/lmc1992.h,
+src/emu/video/cdp1861.c,
+src/emu/video/cdp1861.h,
+src/emu/video/cdp1862.c,
+src/emu/video/cdp1862.h,
+src/emu/video/dm9368.c,
+src/emu/video/dm9368.h,
+src/emu/video/hd44102.c,
+src/emu/video/hd44102.h,
+src/emu/video/i8275.c,
+src/emu/video/i8275.c,
+src/emu/video/i8275.h,
+src/emu/video/sed1330.c,
+src/emu/video/sed1330.h,
+src/emu/video/upd3301.c,
+src/emu/video/upd3301.h,
+mess/src/mess/machine/c2031.c,
+mess/src/mess/machine/c2031.h,
+mess/src/mess/machine/comx_clm.h,
+mess/src/mess/machine/comx_eb.h,
+mess/src/mess/machine/comx_epr.h,
+mess/src/mess/machine/comx_fd.h,
+mess/src/mess/machine/comx_joy.h,
+mess/src/mess/machine/comx_prn.h,
+mess/src/mess/machine/comx_ram.h,
+mess/src/mess/machine/comx_thm.h,
+mess/src/mess/machine/comxexp.c,
+mess/src/mess/machine/comxexp.h,
+mess/src/mess/machine/ecbbus.c,
+mess/src/mess/machine/ecbbus.h,
+mess/src/mess/machine/s100.c,
+mess/src/mess/machine/s100.h,
+mess/src/mess/machine/s100_dj2db.c,
+mess/src/mess/machine/s100_dj2db.h,
+mess/src/mess/machine/s100_djdma.c,
+mess/src/mess/machine/s100_djdma.h,
+mess/src/mess/machine/s100_mm65k16s.c,
+mess/src/mess/machine/s100_mm65k16s.h,
+mess/src/mess/machine/s100_wunderbus.c,
+mess/src/mess/machine/s100_wunderbus.h
 Copyright: The MESS team
 License: MAME
 
@@ -403,6 +473,7 @@ src/emu/didisasm.h,
 src/emu/mconfig.h,
 src/emu/dimemory.h,
 src/build/makedep.c,
+/src/build/makelist.c,
 src/lib/util/cdrom.c,
 src/lib/util/cdrom.h,
 src/lib/util/unzip.h,
@@ -447,7 +518,16 @@ src/lib/util/harddisk.h,
 src/lib/util/vbiparse.c,
 src/lib/util/avcomp.c,
 src/lib/util/tagmap.h,
-src/version.c
+src/version.c,
+src/emu/cothread.c,
+src/emu/cothread.h,
+mess/src/mess/mess.lst,
+mess/src/mess/tiny.lst,
+mess/src/osd/osdcomm.h,
+mess/src/osd/osdcore.h,
+mess/src/osd/osdepend.c,
+mess/src/osd/osdepend.h,
+mess/src/version.c
 Copyright: Aaron Giles
 License: BSD-3-clause
 Copyright Aaron Giles
@@ -589,6 +669,11 @@ License:
  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
  .
 
+Files: src/emu/video/psx.c,
+src/emu/video/psx.h
+Copyright: smf
+License:MAME
+
 Files: src/emu/cpu/pps4/pps4.c
 Copyright: Miodrag Milanovic
 License: MAME

-- 
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


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

2011-07-12 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 0d0128701352be824a8504a7cf1ed3bbd5326604
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jul 12 19:58:42 2011 +0200

Add default data search paths for MESS

diff --git a/debian/mess-data.dirs b/debian/mess-data.dirs
new file mode 100644
index 000..1bac5da
--- /dev/null
+++ b/debian/mess-data.dirs
@@ -0,0 +1,6 @@
+/usr/share/games/mess/cheat
+/usr/share/games/mess/crosshair
+/usr/share/games/mess/ctrlr
+/usr/share/games/mess/fonts
+/usr/share/games/mess/roms
+/usr/share/games/mess/samples
diff --git a/debian/mess-data.lintian-overrides 
b/debian/mess-data.lintian-overrides
new file mode 100644
index 000..5dda08f
--- /dev/null
+++ b/debian/mess-data.lintian-overrides
@@ -0,0 +1,9 @@
+# Allow empty folders for MESS
+# http://lintian.debian.org/manual/ch2.html
+mess-data: package-contains-empty-directory usr/share/games/mess/cheat/
+mess-data: package-contains-empty-directory usr/share/games/mess/crosshair/
+mess-data: package-contains-empty-directory usr/share/games/mess/ctrlr/
+mess-data: package-contains-empty-directory usr/share/games/mess/fonts/
+mess-data: package-contains-empty-directory usr/share/games/mess/roms/
+mess-data: package-contains-empty-directory usr/share/games/mess/samples/
+

-- 
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


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

2011-07-12 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 84bae2f8048cca6b52c4209856bc50f916e2591a
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jul 12 20:00:26 2011 +0200

Remove shlibs deps as mess-data is not a binary

diff --git a/debian/control b/debian/control
index 2fcd081..c8251d1 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Description: Multi Emulator Super System (MESS)
 
 Package: mess-data
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Multi Emulator Super System (MESS)
  MESS is an emulator for various consoles and computing systems, sharing a
  lot of codebase with the MAME project.

-- 
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


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

2011-07-12 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 1be4132c9ee4625f252509cd9a6de8e3938b0e5c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jul 12 20:04:01 2011 +0200

Update .gitignore to new folder structure of mame/mess 0.143

diff --git a/.gitignore b/.gitignore
index 4ce927a..179be2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,15 @@
+artwork/
 cfg/
 chdman
 docs/
 gcc-4.2
+hlsl/
 jedutil
 ldresample
 ldverify
 makefile
 mame
+mess/
 nvram/
 obj/
 regrep

-- 
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


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

2011-07-12 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b02642d9b4d482214b9dcf047ee70da222b272ff
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Jul 12 23:29:01 2011 +0200

Correct Typo

diff --git a/debian/changelog b/debian/changelog
index c2dc1e4..2a7d40d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mame (0.143-1) UNRELEASED; urgency=low
   [ Emmanuel Kasper ]
   * New upstream release
   * Start by default in windowed mode
-  * Add missing ressource directories to match our default mess.ini
+  * Add missing resources directories to match our default mess.ini
 
   [ Félix Arreola Rodríguez ]
   * Remove kfreebsd-build.patch (fixed upstream)

-- 
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

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

2011-07-13 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 8791e348dfbe790e46992dc78e786f5563dc7cdd
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Jul 13 08:10:37 2011 +0200

Delete old patches

diff --git a/debian/patches/fix-help-file.patch 
b/debian/patches/fix-help-file.patch
deleted file mode 100644
index c5848f6..000
--- a/debian/patches/fix-help-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Emmanuel Kasper emman...@libera.cc
-Subject: Fix usage file as shown when calling mame -h
-Forwarded: yes
-Bug: http://www.mametesters.org/view.php?id=4298
 mame-0.142.orig/src/emu/clifront.c 2011-06-09 23:04:15.0 +0200
-+++ mame-0.142/src/emu/clifront.c  2011-06-09 23:04:37.0 +0200
-@@ -361,7 +361,7 @@
-  MAME -showusagefor a brief list of options\n
-  MAME -showconfig   for a list of configuration 
options\n
-  MAME -createconfig to create a  CONFIGNAME 
.ini\n\n
-- For usage instructions, please consult the file 
windows.txt\n);
-+ For usage instructions, please consult the file 
config.txt\n);
- #else
-   mess_display_help();
- #endif
diff --git a/debian/patches/mame_typos.patch b/debian/patches/mame_typos.patch
deleted file mode 100644
index 79ae664..000
--- a/debian/patches/mame_typos.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From: Cesare Falco cesare.fa...@gmail.com
-Subject: Fix typos in mame tree to make lintian happier
-Index: mame-0.142/src/emu/cpu/uml.c
-===
 mame-0.142.orig/src/emu/cpu/uml.c  2011-06-16 09:22:39.0 +0200
-+++ mame-0.142/src/emu/cpu/uml.c   2011-06-16 09:33:13.0 +0200
-@@ -921,7 +921,7 @@
-   if (pnum != 0)
-   buffer.cat(',');
- 
--  // ouput based on type
-+  // output based on type
-   switch (param.type())
-   {
-   // immediates have several special cases
-Index: mame-0.142/src/lib/util/opresolv.c
-===
 mame-0.142.orig/src/lib/util/opresolv.c2011-06-16 09:22:39.0 
+0200
-+++ mame-0.142/src/lib/util/opresolv.c 2011-06-16 09:33:13.0 +0200
-@@ -552,7 +552,7 @@
-   Parameter out of range,   
/* OPTIONRESOLUTION_ERROR_PARAMOUTOFRANGE */
-   Parameter not specified,  
/* OPTIONRESOLUTION_ERROR_PARAMNOTSPECIFIED */
- Unknown parameter,  /* 
OPTIONRESOLUTION_ERROR_PARAMNOTFOUND */
--  Paramter specified multiple times,/* 
OPTIONRESOLUTION_ERROR_PARAMALREADYSPECIFIED */
-+  Parameter specified multiple times,   /* 
OPTIONRESOLUTION_ERROR_PARAMALREADYSPECIFIED */
-   Invalid parameter,
/* OPTIONRESOLUTION_ERROR_BADPARAM */
-   Syntax error, 
/* OPTIONRESOLUTION_ERROR_SYNTAX */
-   Internal error
/* OPTIONRESOLTUION_ERROR_INTERNAL */
-Index: mame-0.142/src/mame/drivers/multfish.c
-===
 mame-0.142.orig/src/mame/drivers/multfish.c2011-06-16 
09:22:40.0 +0200
-+++ mame-0.142/src/mame/drivers/multfish.c 2011-06-16 09:33:13.0 
+0200
-@@ -4081,7 +4081,7 @@
- GAME( 2005, islandb, island_parent,   multfish, multfish,  customl,   
ROT0,  bootleg, Island (bootleg, 050713, VIDEO GAME-1 OS01), 
GAME_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, 
changed version text to VIDEO GAME-1 OS01
- GAME( 2005, islandc, island_parent,   multfish, multfish,  customl,   
ROT0,  bootleg, Island (bootleg, 050713, LOTOS OS01), GAME_SUPPORTS_SAVE ) 
// custom alteras, modified graphics, many texts changed, changed version text 
to LOTOS OS01
- 
--GAME( 2006, island2a,island2_parent,  island2a, multfish,  0, 
ROT0,  bootleg, Island 2 (bootleg, 060529, banking address hack), 
GAME_SUPPORTS_SAVE ) // bank F9 (not standart, game not work)
-+GAME( 2006, island2a,island2_parent,  island2a, multfish,  0, 
ROT0,  bootleg, Island 2 (bootleg, 060529, banking address hack), 
GAME_SUPPORTS_SAVE ) // bank F9 (not standard, game not work)
- GAME( 2006, island2b,island2_parent,  multfish, multfish,  0, 
ROT0,  bootleg, Island 2 (bootleg, 060529, banking address hack, changed 
version text), GAME_SUPPORTS_SAVE ) // bank F9, changed version text to 
070205, skip some start tests
- GAME( 2006, island2c,island2_parent,  multfish, multfish,  0, 
ROT0,  bootleg, Island 2 (bootleg, 060529, LOTTOGAME (I)), 
GAME_SUPPORTS_SAVE ) // bank F9

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

2011-08-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 6077be81abf8117cd0470e4ce5b8358718932020
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Aug 16 23:15:06 2011 +0200

Add png icons for mame

diff --git a/debian/install/hicolor/128x128/apps/mame.png 
b/debian/install/hicolor/128x128/apps/mame.png
new file mode 100644
index 000..d44cb2a
Binary files /dev/null and b/debian/install/hicolor/128x128/apps/mame.png differ
diff --git a/debian/install/hicolor/16x16/apps/mame.png 
b/debian/install/hicolor/16x16/apps/mame.png
new file mode 100644
index 000..5a9118c
Binary files /dev/null and b/debian/install/hicolor/16x16/apps/mame.png differ
diff --git a/debian/install/hicolor/22x22/apps/mame.png 
b/debian/install/hicolor/22x22/apps/mame.png
new file mode 100644
index 000..9a40ac5
Binary files /dev/null and b/debian/install/hicolor/22x22/apps/mame.png differ
diff --git a/debian/install/hicolor/24x24/apps/mame.png 
b/debian/install/hicolor/24x24/apps/mame.png
new file mode 100644
index 000..9d86f91
Binary files /dev/null and b/debian/install/hicolor/24x24/apps/mame.png differ
diff --git a/debian/install/hicolor/32x32/apps/mame.png 
b/debian/install/hicolor/32x32/apps/mame.png
new file mode 100644
index 000..f7c94d1
Binary files /dev/null and b/debian/install/hicolor/32x32/apps/mame.png differ
diff --git a/debian/install/hicolor/48x48/apps/mame.png 
b/debian/install/hicolor/48x48/apps/mame.png
new file mode 100644
index 000..99e9e6e
Binary files /dev/null and b/debian/install/hicolor/48x48/apps/mame.png differ
diff --git a/debian/install/hicolor/72x72/apps/mame.png 
b/debian/install/hicolor/72x72/apps/mame.png
new file mode 100644
index 000..9e0cf1d
Binary files /dev/null and b/debian/install/hicolor/72x72/apps/mame.png differ

-- 
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


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

2011-08-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 2202d53df0877bec8da4ad63096c7857d83823a4
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Aug 30 18:51:42 2011 +0200

Add png icons for mame taken from the hydroxygen icon set

diff --git a/debian/mame.install b/debian/mame.install
index 10dff00..207f81e 100644
--- a/debian/mame.install
+++ b/debian/mame.install
@@ -4,3 +4,12 @@ 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
+
+./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
+./debian/install/hicolor/32x32/apps/mame.png usr/share/icons/hicolor/32x32/apps
+./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
+

-- 
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


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

2011-08-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 9be82254459020e73726d5401a965119a2373c3c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Aug 30 17:09:37 2011 +0200

Add copyright info for icons

diff --git a/debian/copyright b/debian/copyright
index 55e35c5..95c77f5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,8 @@
 Format-Specification: http://dep.debian.net/deps/dep5/
 Upstream-Name: MAME
 Source: http://mamedev.org and http://mess.redump.net. The mess source code is 
a source code layer which is added to the mame source code for building.
+The mame icons are part of the hydroxygen icon set, downloaded from 
+http://deviantdark.deviantart.com/art/hydroxygen-iconset-100826865
 Disclaimer: 
  This package is not part of the GNU/Linux Debian distribution.  It is
  provided in the non-free archive area as a convenience to Debian users.
@@ -17,6 +19,10 @@ Copyright: Cesare Falco cesare.fa...@gmail.com
Mamedeb team m...@packages.debian.org
 License: GPL-2+
 
+Files: debian/install/hicolor/*
+Copyright: deviantdark [www.deviantdark.com]
+License: GPL-3+
+
 Files: *
 Copyright: Nicola Salmoria and the MAME team
 License: MAME
@@ -837,6 +843,10 @@ License: GPL-2
  See the file /usr/share/common-licenses/GPL-2.
  .
 
+License: GPL-3
+ See the file /usr/share/common-licenses/GPL-3.
+ .
+
 License: LGPL-2.1
  See the file /usr/share/common-licenses/LGPL-2.1
  .

-- 
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


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

2011-08-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 382535f38c0534d05c715821339f89caf7a2cee5
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Aug 30 18:57:54 2011 +0200

Add Free Desktop compliant png icons of various sizes taken from
the hydroxygen iconset

diff --git a/debian/changelog b/debian/changelog
index d91d1a7..b1c6a48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mame (0.143-4) UNRELEASED; urgency=low
+
+  * Add Free Desktop compliant png icons of various sizes taken from
+  the hydroxygen iconset
+
+ -- Emmanuel Kasper emman...@libera.cc  Tue, 30 Aug 2011 18:55:12 +0200
+
 mame (0.143-3) unstable; urgency=low
 
   * Avoid ignoring make clean errors.

-- 
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


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

2011-08-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 12ad19e9e0471ac0683474b3bcf22becb0881da1
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Aug 30 19:04:45 2011 +0200

Remove leading slash in included icon path

diff --git a/debian/mame.install b/debian/mame.install
index 207f81e..243af57 100644
--- a/debian/mame.install
+++ b/debian/mame.install
@@ -5,11 +5,11 @@ debian/mame.ini etc/mame
 hash.mame/* usr/share/games/mame/hash
 src/osd/sdl/keymaps/*.txt usr/share/games/mame/keymaps
 
-./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
-./debian/install/hicolor/32x32/apps/mame.png usr/share/icons/hicolor/32x32/apps
-./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/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
+debian/install/hicolor/32x32/apps/mame.png usr/share/icons/hicolor/32x32/apps
+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
 

-- 
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


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

2011-08-30 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 2bd7c1c3b941b1c89edbb27f26583baa2321bb2b
Author: Emmanuel Kasper emman...@libera.cc
Date:   Tue Aug 30 21:06:21 2011 +0200

Motify to dpkg we distribute binary files ( ie, the icons ) in the /debian 
dir

diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 000..11e246d
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,7 @@
+debian/install/hicolor/16x16/apps/mame.png
+debian/install/hicolor/22x22/apps/mame.png
+debian/install/hicolor/24x24/apps/mame.png
+debian/install/hicolor/32x32/apps/mame.png
+debian/install/hicolor/48x48/apps/mame.png
+debian/install/hicolor/72x72/apps/mame.png
+debian/install/hicolor/128x128/apps/mame.png

-- 
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


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

2011-08-31 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit affbb7f1b577745a6441fbf0cc3da62935fd8238
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Aug 31 19:20:17 2011 +0200

Add Artwork Section explaining where to get artwork files

diff --git a/debian/mame.README.Debian b/debian/mame.README.Debian
index 3a51a99..bb5af8a 100644
--- a/debian/mame.README.Debian
+++ b/debian/mame.README.Debian
@@ -55,7 +55,7 @@ in {{{/etc/mame/mame.ini}}}
 
 If you need to change the location of the roms folder or tweak something like 
 video or cheats you can either:
-  * make your own copy of {{{/etc/mame/mame.ini}}} in your home at 
{{{$HOME/.mame/mame.ini}}} and edit that file (recommended)
+  * make your own copy of {{{/etc/mame/mame.ini}}} in 
{{{$HOME/.mame/mame.ini}}} and edit that file (recommended)
   * edit directly {{{/etc/mame/mame.ini}}} 
 
 You can verify that MAME have read the correct options with {{{mame 
-showconfig}}}
@@ -75,3 +75,10 @@ This package uses quilt to manage all modifications to the 
upstream source.
 Changes are stored in the source package as diffs in debian/patches and applied
 during the build. See {{{/usr/share/doc/quilt/README.source}}} for a detailed
 explanation.
+
+== ARTWORK ==
+
+Backdrop, overlay and bezel artwork can be downloaded from 
http://mirror.xmission.com/mame/ individually or globally with the following 
command ( provided your artwork search path is {{{$HOME/mame/artwork}}}, which 
is the default )
+{{{
+wget --no-directories --recursive --reject *.html  --directory-prefix 
$HOME/mame/artwork http://mirror.xmission.com/mame/artwork/
+}}}

-- 
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


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

2011-08-31 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 1db9c996f18093ac3211b10fb8658aa7b8445500
Author: Emmanuel Kasper emman...@libera.cc
Date:   Wed Aug 31 22:57:04 2011 +0200

Replace http with ftp protocol for mame artwork URL

diff --git a/debian/mame.README.Debian b/debian/mame.README.Debian
index bb5af8a..26f5a7e 100644
--- a/debian/mame.README.Debian
+++ b/debian/mame.README.Debian
@@ -80,5 +80,6 @@ explanation.
 
 Backdrop, overlay and bezel artwork can be downloaded from 
http://mirror.xmission.com/mame/ individually or globally with the following 
command ( provided your artwork search path is {{{$HOME/mame/artwork}}}, which 
is the default )
 {{{
-wget --no-directories --recursive --reject *.html  --directory-prefix 
$HOME/mame/artwork http://mirror.xmission.com/mame/artwork/
+wget --no-directories --recursive   --directory-prefix $HOME/mame/artwork 
ftp://mirror.xmission.com/mame/artwork/
 }}}
+

-- 
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


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

2011-09-25 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit bb42c06cc08e5fbc09638fafc0348769efcc9103
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Sep 25 19:19:22 2011 +0200

Translate French Desktop entries into french

You jsut read right: up to now they were in English

diff --git a/debian/install/mame.desktop b/debian/install/mame.desktop
index 6096c9f..5b37a89 100644
--- a/debian/install/mame.desktop
+++ b/debian/install/mame.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Name=MAME™ Arcade Emulator
 Name[ca]=Emulador de jocs arcade MAME™
-Name[fr]=MAME™ arcade emulator
+Name[fr]=Emulateur arcade MAME™
 GenericName=Arcade Emulator
 GenericName[ca]=Emulador de jocs arcade
-GenericName[fr]=Arcade emulator
+GenericName[fr]=Emulateur arcade
 Comment=Play vintage arcade games using the MAME emulator
 Comment[ca]=Jugueu a jocs d'arcade antics emprant l'emulador MAME
 Exec=/usr/games/mame

-- 
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

[SCM] packaging for the mame arcade game emulator branch, mess-only, created. d81049e850fe099f9ba2c946b38081993ae07a99

2011-11-20 Thread Emmanuel Kasper
The branch, mess-only has been created
at  d81049e850fe099f9ba2c946b38081993ae07a99 (commit)

- Shortlog 
commit d81049e850fe099f9ba2c946b38081993ae07a99
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 13:02:34 2011 +0100

Don't shuffle around the mess source code anymore

commit db7036254d20ca6bc2622eb8780581c461295254
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 12:23:45 2011 +0100

Remove downloading of MAME sources, since they are now provided with mess

commit 9d99923375f3b680bbdac9e6be76597c6c1e25b2
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 12:13:34 2011 +0100

Correct comment in code

commit f59ab12743e2190d05ec2e82cd5b61e707be23b8
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 12:11:33 2011 +0100

Create mess tarball with proper name: 
$(MESS_PACKAGE)_$(VERSION).orig.tar.bz2

commit 752b85cd239caca15e46608a213ec0a156f78dc6
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 12:03:25 2011 +0100

Rename source package to mess

---

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. c0b756047f813152ffa088db3999d4e7b70a863b

2011-11-20 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 870c4031c1c726585736d5e286cc34d3b4bc84a5
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 13:28:27 2011 +0100

Chmoding file is not necessary naymore in this release

diff --git a/debian/rules b/debian/rules
index 815ca0b..f69a4e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -162,8 +162,6 @@ override_dh_installdocs:
 
 # Remove OSX specific keymaps
 override_dh_install:
-   # some data files created on windows show up as executables: fix it
-   chmod 644 messdir/hash/*
dh_install --exclude=OSX.txt
 
 

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. c0b756047f813152ffa088db3999d4e7b70a863b

2011-11-20 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit d88b1c29bcb12dff972131bbd2a0bc7bbb6e75a9
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 13:36:50 2011 +0100

Correct path to mess ressource

diff --git a/debian/rules b/debian/rules
index f69a4e7..15fb69c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,7 @@ override_dh_auto_clean:
 # so we need to make an explicit call
 override_dh_installchangelogs:
dh_installchangelogs whatsnew.txt
-   dh_installchangelogs -pmess messdir/docs/messnew.txt
+   dh_installchangelogs -pmess docs/messnew.txt
 
 # Remove Windows specific documentation
 override_dh_installdocs:

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. c0b756047f813152ffa088db3999d4e7b70a863b

2011-11-20 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit c0b756047f813152ffa088db3999d4e7b70a863b
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 13:42:01 2011 +0100

Add keymaps/ and sysinfo.dat

diff --git a/.gitignore b/.gitignore
index 179be2c..105857f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ mame_0.139.orig.tar.gz
 mame_0.141.orig.tar.bz2
 .pc
 hash/
+keymaps/
+sysinfo.dat

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. 2b5f094aa5a7a757c0df0a85edff1159e9bfc956

2011-11-20 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 2b5f094aa5a7a757c0df0a85edff1159e9bfc956
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 15:43:36 2011 +0100

Comment out Mame hash files as we don't ship their anymore

diff --git a/debian/mame.dirs b/debian/mame.dirs
index 197a73b..7795c14 100644
--- a/debian/mame.dirs
+++ b/debian/mame.dirs
@@ -2,6 +2,6 @@ usr/share/games/mame/artwork
 usr/share/games/mame/cheat
 usr/share/games/mame/crosshair
 usr/share/games/mame/ctrlr
-usr/share/games/mame/hash
+#usr/share/games/mame/hash
 usr/share/games/mame/roms
 usr/share/games/mame/samples

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. 6e3f30ab849c47813f6d52f73940a444344bb376

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 0164234b493478591c0e89df2d057e4ea4d845e6
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 27 14:27:47 2011 +0100

rename mame-tools to mess-tools

diff --git a/debian/control b/debian/control
index 741a4b7..387edd1 100644
--- a/debian/control
+++ b/debian/control
@@ -37,18 +37,15 @@ Description: Multiple Arcade Machine Emulator (MAME)
  .
  This package provides the MAME binary and configuration files.
 
-Package: mame-tools
+Package: mess-tools
 Section: non-free/utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: mame (= ${source:Version})
-Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143)
+Recommends: mess (= ${source:Version})
+Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143), mame-tools ( 0.143)
 Description: Tools for Multiple Arcade Machine Emulator (MAME)
- MAME is a hardware emulator: it faithfully reproduces the behavior of many
- arcade machines (it is not a simulation). This program is not a game but can
- directly, through ROM images, run the complete system of these old arcade
- machines. These ROMs are subject to copyright and it is in most of the cases
- illegal to use them if you do not own the arcade machine.
+ MESS is an emulator for various consoles and computing systems, sharing a
+ lot of codebase with the MAME project.
  .
  This package provides tools to be used with MAME and MESS. It currently
  contains:

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. 6e3f30ab849c47813f6d52f73940a444344bb376

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 17c8c1476395d234abd37db7725ed0a3a290f397
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 27 14:34:51 2011 +0100

rename mass-tools to mess-tools

diff --git a/debian/mame-tools.install b/debian/mess-tools.install
similarity index 100%
rename from debian/mame-tools.install
rename to debian/mess-tools.install
diff --git a/debian/mame-tools.manpages b/debian/mess-tools.manpages
similarity index 100%
rename from debian/mame-tools.manpages
rename to debian/mess-tools.manpages

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. 6e3f30ab849c47813f6d52f73940a444344bb376

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 6e3f30ab849c47813f6d52f73940a444344bb376
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 27 14:49:56 2011 +0100

Revert rename mame-tools to mess-tools

This reverts commit 0164234b493478591c0e89df2d057e4ea4d845e6.

diff --git a/debian/control b/debian/control
index 387edd1..741a4b7 100644
--- a/debian/control
+++ b/debian/control
@@ -37,15 +37,18 @@ Description: Multiple Arcade Machine Emulator (MAME)
  .
  This package provides the MAME binary and configuration files.
 
-Package: mess-tools
+Package: mame-tools
 Section: non-free/utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: mess (= ${source:Version})
-Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143), mame-tools ( 0.143)
+Recommends: mame (= ${source:Version})
+Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143)
 Description: Tools for Multiple Arcade Machine Emulator (MAME)
- MESS is an emulator for various consoles and computing systems, sharing a
- lot of codebase with the MAME project.
+ MAME is a hardware emulator: it faithfully reproduces the behavior of many
+ arcade machines (it is not a simulation). This program is not a game but can
+ directly, through ROM images, run the complete system of these old arcade
+ machines. These ROMs are subject to copyright and it is in most of the cases
+ illegal to use them if you do not own the arcade machine.
  .
  This package provides tools to be used with MAME and MESS. It currently
  contains:

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. 6e3f30ab849c47813f6d52f73940a444344bb376

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 60005a4712b58ce2f16e6dc0e5edee705f570050
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 27 14:48:34 2011 +0100

Revert rename mass-tools to mess-tools

This reverts commit 17c8c1476395d234abd37db7725ed0a3a290f397.

diff --git a/debian/mess-tools.install b/debian/mame-tools.install
similarity index 100%
rename from debian/mess-tools.install
rename to debian/mame-tools.install
diff --git a/debian/mess-tools.manpages b/debian/mame-tools.manpages
similarity index 100%
rename from debian/mess-tools.manpages
rename to debian/mame-tools.manpages

-- 
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


[SCM] packaging for the mame arcade game emulator branch, mess-only, updated. 6e3f30ab849c47813f6d52f73940a444344bb376

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the mess-only branch:
commit 5f054a5a0953fb1853c60c0900134d62a571ee91
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 27 14:49:35 2011 +0100

Revert remove mame stuff

This reverts commit 117671e05214d88b1d3d5b07dbc4ff7f193a3eae.

diff --git a/debian/control b/debian/control
index 9de5248..387edd1 100644
--- a/debian/control
+++ b/debian/control
@@ -21,12 +21,28 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/mame.git
 Homepage: http://mess.org/
 XS-Autobuild: yes
 
+Package: mame
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: mame-tools, gnome-video-arcade
+Provides: xmame-common, xmame-sdl, xmame-svga, xmame-x
+Replaces: xmame-common ( 0.140), xmame-sdl ( 0.140), xmame-svga ( 
0.140), xmame-x ( 0.140)
+Breaks: xmame-common ( 0.140), xmame-sdl ( 0.140), xmame-svga ( 0.140), 
xmame-x ( 0.140), sdlmame ( 0.143)
+Description: Multiple Arcade Machine Emulator (MAME)
+ MAME is a hardware emulator: it faithfully reproduces the behavior of many
+ arcade machines (it is not a simulation). This program is not a game but can
+ directly, through ROM images, run the complete system of these old arcade
+ machines. These ROMs are subject to copyright and it is in most of the cases
+ illegal to use them if you do not own the arcade machine.
+ .
+ This package provides the MAME binary and configuration files.
+
 Package: mess-tools
 Section: non-free/utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: mess (= ${source:Version})
-Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143), mame-tools ( 0.144)
+Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143), mame-tools ( 0.143)
 Description: Tools for Multiple Arcade Machine Emulator (MAME)
  MESS is an emulator for various consoles and computing systems, sharing a
  lot of codebase with the MAME project.
@@ -77,6 +93,27 @@ Description: Data files for the Multi Emulator Super System 
(MESS)
  .
  This package provides the MESS hash files, keymaps and artwork.
 
+Package: xmame-sdl
+Depends: mame, ${misc:Depends}
+Architecture: all
+Description: Transitional package for xmame-sdl
+ This is a transitional package for xmame-sdl, and can be safely removed
+ after the installation is complete.
+
+Package: xmame-svga
+Depends: mame, ${misc:Depends}
+Architecture: i386
+Description: Transitional package for xmame-svga
+ This is a transitional package for xmame-svga, and can be safely removed
+ after the installation is complete.
+
+Package: xmame-x
+Depends: mame, ${misc:Depends}
+Architecture: all
+Description: Transitional package for xmame-x
+ This is a transitional package for xmame-x, and can be safely removed
+ after the installation is complete.
+
 Package: xmame-tools
 Depends: mame, ${misc:Depends}
 Architecture: all
@@ -98,17 +135,16 @@ Description: Transitional package for xmess-x
  This is a transitional package for xmess-x, and can be safely removed
  after the installation is complete.
 
-Package: sdlmame-tools
-Depends: mame-tools, ${misc:Depends}
+Package: sdlmame
+Depends: mame, ${misc:Depends}
 Architecture: amd64 i386
-Description: Transitional package for sdlmame-tools
- This is a transitional package for sdlmame-tools, and can be safely removed
+Description: Transitional package for sdlmame
+ This is a transitional package for sdlmame, and can be safely removed
  after the installation is complete.
 
-Package: mame-tools
-Depends: mess-tools, ${misc:Depends}
+Package: sdlmame-tools
+Depends: mame-tools, ${misc:Depends}
 Architecture: amd64 i386
 Description: Transitional package for sdlmame-tools
  This is a transitional package for sdlmame-tools, and can be safely removed
  after the installation is complete.
-

-- 
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


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

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 427a765f51376280fa0d4cc80dec946884cb07b8
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 23:53:19 2011 +0100

Remove shuffling around of mess source codes

diff --git a/debian/rules b/debian/rules
index 609322d..8a2e00b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,21 +132,7 @@ endif
 %:
dh $@
 
-prepare_mess_dirs:
-   # MESS is an overlay of the MAME source code, but we need to have
-   # the code in a mess directory, as that's how dpkg components
-   # work. Move dirs and create symlinks for MESS stuff outside its
-   # component directory to enable its build.
-   [ -d mess ]  mv mess messdir
-   [ -d hash ]  mv hash hash.mame
-   [ -d artwork ]  mv artwork artwork.mame
-   [ ! -L hash ]  ln -s messdir/hash hash
-   [ ! -L artwork ]  ln -s messdir/artwork artwork
-   [ ! -L sysinfo.dat ]  ln -s messdir/sysinfo.dat sysinfo.dat
-   [ ! -L src/mess ]  ln -s ../messdir/src/mess src/mess
-   touch $@
-
-override_dh_auto_build: prepare_mess_dirs
+override_dh_auto_build:
$(MAKE) -j3 $(DEB_MAME_OPTS) all
$(CURDIR)/mame -createconfig
mv mame.ini default.mame.ini
@@ -158,18 +144,9 @@ override_dh_auto_clean:
echo Starting clean process...
$(MAKE) $(DEB_MAME_OPTS) clean
# target may fail if the symlinks have not been created
-   [ ! -L src/mess ] || $(MAKE) $(DEB_MESS_OPTS) clean
-   -rm prepare_mess_dirs
+   $(MAKE) $(DEB_MESS_OPTS) clean
[ ! -f default.mame.ini ] || rm default.mame.ini
[ ! -f default.mess.ini ] || rm default.mess.ini
-   # Undo MESS modifications.
-   [ ! -L artwork ] || rm artwork
-   [ ! -L hash ] || rm hash
-   [ ! -L sysinfo.dat ] || rm sysinfo.dat
-   [ ! -L src/mess ] || rm src/mess
-   [ ! -d hash.mame ] || mv hash.mame hash
-   [ ! -d artwork.mame ] || mv artwork.mame artwork
-   [ ! -d messdir ] || mv messdir mess
 
 # dh_installchangelogs doesn't know about whatsnew.txt,
 # so we need to make an explicit call

-- 
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


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

2011-11-27 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b7b10bd586479f28cd05a48c4c4a580e390cc2b4
Author: Emmanuel Kasper emman...@libera.cc
Date:   Sun Nov 20 23:53:38 2011 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index c4445a6..4af7c8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mame (0.144-1) UNRELEASED; urgency=low
+
+  * New upstream release, handling of mess commented out
+
+ -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 23:44:36 +0100
+
 mame (0.143-4) UNRELEASED; urgency=low
 
   [ Emmanuel Kasper ]

-- 
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


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

2011-12-01 Thread Emmanuel Kasper
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


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

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit f90008753ab4739341dd557c77f1636de7302e15
Author: Emmanuel Kasper emman...@libera.cc
Date:   Thu Dec 1 15:16:19 2011 +0100

Re- Add jordi's changed who disappeared after reverting the merge
of the mess-only branch

diff --git a/debian/changelog b/debian/changelog
index 4af7c8a..98a4e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 mame (0.144-1) UNRELEASED; urgency=low
+  [ Jordi Mallach ]
+* Use a versioned copyright Format specification field.
+* Update Vcs-* URLs.
 
+[Emmanuel Kasper]
   * New upstream release, handling of mess commented out
 
  -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 23:44:36 +0100
diff --git a/debian/control b/debian/control
index e83598b..d75011e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends: debhelper (= 8),
libxinerama-dev,
zlib1g-dev
 Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-games/mame.git
-Vcs-Browser: http://git.debian.org/?p=pkg-games/mame.git
+Vcs-Git: git://anonscm.debian.org/pkg-games/mame.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/mame.git
 Homepage: http://mamedev.org/
 XS-Autobuild: yes
 
diff --git a/debian/copyright b/debian/copyright
index a2d4702..bb33a62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format-Specification: 
http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208view=co
 Upstream-Name: MAME
 Source: http://mamedev.org and http://mess.redump.net. The mess source code is 
a source code layer which is added to the mame source code for building.
 The mame icons are part of the hydroxygen icon set, downloaded from 

-- 
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


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

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit be3b2b5fdec37a0df1ba10bd7b4bfd73a7b4e08c
Author: Emmanuel Kasper emman...@libera.cc
Date:   Thu Dec 1 14:45:59 2011 +0100

unmerge mess-only branch

diff --git a/.gitignore b/.gitignore
index 105857f..179be2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,5 +26,3 @@ mame_0.139.orig.tar.gz
 mame_0.141.orig.tar.bz2
 .pc
 hash/
-keymaps/
-sysinfo.dat
diff --git a/debian/changelog b/debian/changelog
index 3e7af17..4af7c8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
-mess (0.144-1) UNRELEASED; urgency=low
+mame (0.144-1) UNRELEASED; urgency=low
 
-  * New upstream release, switching to mess.org zipfile as upstream
-tarball
+  * New upstream release, handling of mess commented out
 
- -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 12:02:16 +0100
+ -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 23:44:36 +0100
 
 mame (0.143-4) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 741a4b7..e83598b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mess
+Source: mame
 Section: non-free/games
 Priority: optional
 Maintainer: Debian Games Team pkg-games-de...@lists.alioth.debian.org
@@ -18,7 +18,7 @@ Build-Depends: debhelper (= 8),
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-games/mame.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/mame.git
-Homepage: http://mess.org/
+Homepage: http://mamedev.org/
 XS-Autobuild: yes
 
 Package: mame
diff --git a/debian/copyright b/debian/copyright
index c7732d1..a2d4702 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: 
http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208view=co
+Format-Specification: http://dep.debian.net/deps/dep5/
 Upstream-Name: MAME
 Source: http://mamedev.org and http://mess.redump.net. The mess source code is 
a source code layer which is added to the mame source code for building.
 The mame icons are part of the hydroxygen icon set, downloaded from 
diff --git a/debian/mame.dirs b/debian/mame.dirs
index 7795c14..197a73b 100644
--- a/debian/mame.dirs
+++ b/debian/mame.dirs
@@ -2,6 +2,6 @@ usr/share/games/mame/artwork
 usr/share/games/mame/cheat
 usr/share/games/mame/crosshair
 usr/share/games/mame/ctrlr
-#usr/share/games/mame/hash
+usr/share/games/mame/hash
 usr/share/games/mame/roms
 usr/share/games/mame/samples
diff --git a/debian/mess-data.install b/debian/mess-data.install
index 35b15c6..ee3b3b2 100644
--- a/debian/mess-data.install
+++ b/debian/mess-data.install
@@ -1,4 +1,4 @@
-artwork/* usr/share/games/mess/artwork
-hash/* usr/share/games/mess/hash
-sysinfo.dat usr/share/games/mess
+messdir/artwork/* usr/share/games/mess/artwork
+messdir/hash/* usr/share/games/mess/hash
+messdir/sysinfo.dat usr/share/games/mess
 src/osd/sdl/keymaps/*.txt usr/share/games/mess/keymaps
diff --git a/debian/rules b/debian/rules
index 15fb69c..8a2e00b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,7 @@ override_dh_auto_clean:
 # so we need to make an explicit call
 override_dh_installchangelogs:
dh_installchangelogs whatsnew.txt
-   dh_installchangelogs -pmess docs/messnew.txt
+   dh_installchangelogs -pmess messdir/docs/messnew.txt
 
 # Remove Windows specific documentation
 override_dh_installdocs:
@@ -162,31 +162,56 @@ override_dh_installdocs:
 
 # Remove OSX specific keymaps
 override_dh_install:
+   # some data files created on windows show up as executables: fix it
+   chmod 644 messdir/hash/*
dh_install --exclude=OSX.txt
 
 
 # Convert upstream sources from zip to tar.bz2
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
-
+MAME_PACKAGE = mame
+MAME_FILEBASE = $(MAME_PACKAGE)$(VERSION)
+MAME_URL = http://mamedev.org/downloader.php?file=releases/
 MESS_PACKAGE = mess
 MESS_FILEBASE = $(MESS_PACKAGE)$(VERSION)
 MESS_URL = http://mess.redump.net/_media/downloads:
 
-AGENT = Debian MAME/MESS Packagers m...@packages.debian.org
+AGENT = Debian MAME Packagers m...@packages.debian.org
 TMPDIR := $(shell mktemp --dry-run --directory -p .)
 
 # Upstream zip file does not have a dot in its name, so we have to cut it out
 UPSTREAM_VERSION := $(shell echo $(VERSION) | sed -e 's/\.//' )
 
+$(MAME_FILEBASE)s.zip:
+   wget -U '$(AGENT)' \
+$(MAME_URL)$(MAME_PACKAGE)$(UPSTREAM_VERSION)s.zip \
+-O $(MAME_FILEBASE)s.zip
+
 $(MESS_FILEBASE)s.zip:
wget -U '$(AGENT)' \
 $(MESS_URL)$(MESS_PACKAGE)$(UPSTREAM_VERSION)s.zip \
 -O $(MESS_FILEBASE)s.zip
 
-get-orig-source: $(MESS_FILEBASE)s.zip
+get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip
mkdir $(TMPDIR)
 
-   # Create an orig.tar.bz2 tarball for MESS
+   # Create an orig.tar.bz2 tarball for MAME
+   unzip $(MAME_FILEBASE)s.zip -d $(TMPDIR)
+   mkdir -p $(TMPDIR)/sub/$(MAME_PACKAGE)-$(VERSION)
+   # Not a bug: Mame source needs to be unzipped twice

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

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 1cecb0b1e72d74bd438c07c2b5b4eebc42f1aac9
Author: Emmanuel Kasper emman...@libera.cc
Date:   Thu Dec 1 16:02:13 2011 +0100

Remove reference to mess

diff --git a/debian/rules b/debian/rules
index 8a2e00b..549d08d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,23 +136,17 @@ override_dh_auto_build:
$(MAKE) -j3 $(DEB_MAME_OPTS) all
$(CURDIR)/mame -createconfig
mv mame.ini default.mame.ini
-   $(MAKE) -j3 $(DEB_MESS_OPTS) all
-   $(CURDIR)/mess -createconfig
-   mv mess.ini default.mess.ini
 
 override_dh_auto_clean:
echo Starting clean process...
$(MAKE) $(DEB_MAME_OPTS) clean
# target may fail if the symlinks have not been created
-   $(MAKE) $(DEB_MESS_OPTS) clean
[ ! -f default.mame.ini ] || rm default.mame.ini
-   [ ! -f default.mess.ini ] || rm default.mess.ini
 
 # dh_installchangelogs doesn't know about whatsnew.txt,
 # so we need to make an explicit call
 override_dh_installchangelogs:
dh_installchangelogs whatsnew.txt
-   dh_installchangelogs -pmess messdir/docs/messnew.txt
 
 # Remove Windows specific documentation
 override_dh_installdocs:
@@ -163,7 +157,6 @@ override_dh_installdocs:
 # Remove OSX specific keymaps
 override_dh_install:
# some data files created on windows show up as executables: fix it
-   chmod 644 messdir/hash/*
dh_install --exclude=OSX.txt
 
 
@@ -187,12 +180,7 @@ $(MAME_FILEBASE)s.zip:
 $(MAME_URL)$(MAME_PACKAGE)$(UPSTREAM_VERSION)s.zip \
 -O $(MAME_FILEBASE)s.zip
 
-$(MESS_FILEBASE)s.zip:
-   wget -U '$(AGENT)' \
-$(MESS_URL)$(MESS_PACKAGE)$(UPSTREAM_VERSION)s.zip \
--O $(MESS_FILEBASE)s.zip
-
-get-orig-source: $(MAME_FILEBASE)s.zip $(MESS_FILEBASE)s.zip
+get-orig-source: $(MAME_FILEBASE)s.zip
mkdir $(TMPDIR)
 
# Create an orig.tar.bz2 tarball for MAME
@@ -211,17 +199,4 @@ get-orig-source: $(MAME_FILEBASE)s.zip 
$(MESS_FILEBASE)s.zip
bzip2 -c9   ../$(MAME_PACKAGE)_$(VERSION).orig.tar.bz2
rm -f $(MAME_FILEBASE)s.zip
 
-   # Create an orig-mess.tar.bz2 component tarball for MESS
-   mkdir -p $(TMPDIR)/$(MESS_PACKAGE)-$(VERSION)
-   unzip $(MESS_FILEBASE)s.zip -d $(TMPDIR)/$(MESS_PACKAGE)-$(VERSION)
-   # Strip trailing CR
-   find $(TMPDIR)/$(MESS_PACKAGE)-$(VERSION) \
-   -type f -regextype posix-egrep \
-   ! -regex .*(zip|gif|png|bmp|ico) \
-   | sed 's/\ /\\\ /g' \
-   | xargs sed -i s/\r$$//
-   tar -C $(TMPDIR) -cvf - $(MESS_PACKAGE)-$(VERSION) | \
-   bzip2 -c9   
../$(MAME_PACKAGE)_$(VERSION).orig-$(MESS_PACKAGE).tar.bz2
-   rm -f $(MESS_FILEBASE)s.zip
-
rm -rf $(TMPDIR)

-- 
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


[SCM] mess system emulator branch, master, updated. 43b829e87f4255081f578f591a22076d32e3a75a

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 7167d0d26b22eaafdebadb3f6f9016a26878c36f
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 00:34:05 2011 +0100

update mame-tools description to mention MESS more clearly

diff --git a/debian/control b/debian/control
index aea99d0..4587337 100644
--- a/debian/control
+++ b/debian/control
@@ -27,12 +27,11 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: mame (= ${source:Version})
 Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143)
-Description: Tools for Multiple Arcade Machine Emulator (MAME)
+Description: Tools for MAME and MESS
  MAME is a hardware emulator: it faithfully reproduces the behavior of many
- arcade machines (it is not a simulation). This program is not a game but can
- directly, through ROM images, run the complete system of these old arcade
- machines. These ROMs are subject to copyright and it is in most of the cases
- illegal to use them if you do not own the arcade machine.
+ arcade machines (it is not a simulation).
+ MESS is an emulator for various consoles and computing systems, sharing a
+ lot of codebase with the MAME project.
  .
  This package provides tools to be used with MAME and MESS. It currently
  contains:

-- 
mess system 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


[SCM] mess system emulator branch, master, updated. 43b829e87f4255081f578f591a22076d32e3a75a

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 98fef86cc756fc244cc9e3178ef358b14a127fc9
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 00:31:36 2011 +0100

Remove building of mame binary and *mame virtual packages

diff --git a/debian/control b/debian/control
index 741a4b7..aea99d0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,22 +21,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/mame.git
 Homepage: http://mess.org/
 XS-Autobuild: yes
 
-Package: mame
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: mame-tools, gnome-video-arcade
-Provides: xmame-common, xmame-sdl, xmame-svga, xmame-x
-Replaces: xmame-common ( 0.140), xmame-sdl ( 0.140), xmame-svga ( 
0.140), xmame-x ( 0.140)
-Breaks: xmame-common ( 0.140), xmame-sdl ( 0.140), xmame-svga ( 0.140), 
xmame-x ( 0.140), sdlmame ( 0.143)
-Description: Multiple Arcade Machine Emulator (MAME)
- MAME is a hardware emulator: it faithfully reproduces the behavior of many
- arcade machines (it is not a simulation). This program is not a game but can
- directly, through ROM images, run the complete system of these old arcade
- machines. These ROMs are subject to copyright and it is in most of the cases
- illegal to use them if you do not own the arcade machine.
- .
- This package provides the MAME binary and configuration files.
-
 Package: mame-tools
 Section: non-free/utils
 Architecture: any
@@ -96,27 +80,6 @@ Description: Data files for the Multi Emulator Super System 
(MESS)
  .
  This package provides the MESS hash files, keymaps and artwork.
 
-Package: xmame-sdl
-Depends: mame, ${misc:Depends}
-Architecture: all
-Description: Transitional package for xmame-sdl
- This is a transitional package for xmame-sdl, and can be safely removed
- after the installation is complete.
-
-Package: xmame-svga
-Depends: mame, ${misc:Depends}
-Architecture: i386
-Description: Transitional package for xmame-svga
- This is a transitional package for xmame-svga, and can be safely removed
- after the installation is complete.
-
-Package: xmame-x
-Depends: mame, ${misc:Depends}
-Architecture: all
-Description: Transitional package for xmame-x
- This is a transitional package for xmame-x, and can be safely removed
- after the installation is complete.
-
 Package: xmame-tools
 Depends: mame, ${misc:Depends}
 Architecture: all
@@ -138,13 +101,6 @@ Description: Transitional package for xmess-x
  This is a transitional package for xmess-x, and can be safely removed
  after the installation is complete.
 
-Package: sdlmame
-Depends: mame, ${misc:Depends}
-Architecture: amd64 i386
-Description: Transitional package for sdlmame
- This is a transitional package for sdlmame, and can be safely removed
- after the installation is complete.
-
 Package: sdlmame-tools
 Depends: mame-tools, ${misc:Depends}
 Architecture: amd64 i386
diff --git a/debian/rules b/debian/rules
index 15fb69c..63be084 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,19 +133,14 @@ endif
dh $@
 
 override_dh_auto_build:
-   $(MAKE) -j3 $(DEB_MAME_OPTS) all
-   $(CURDIR)/mame -createconfig
-   mv mame.ini default.mame.ini
$(MAKE) -j3 $(DEB_MESS_OPTS) all
$(CURDIR)/mess -createconfig
mv mess.ini default.mess.ini
 
 override_dh_auto_clean:
echo Starting clean process...
-   $(MAKE) $(DEB_MAME_OPTS) clean
# target may fail if the symlinks have not been created
$(MAKE) $(DEB_MESS_OPTS) clean
-   [ ! -f default.mame.ini ] || rm default.mame.ini
[ ! -f default.mess.ini ] || rm default.mess.ini
 
 # dh_installchangelogs doesn't know about whatsnew.txt,

-- 
mess system 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


[SCM] mess system emulator branch, master, updated. 43b829e87f4255081f578f591a22076d32e3a75a

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit c65f6cd124da2380dcff20d686754358a4c9c0ec
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 00:39:38 2011 +0100

Changelog

diff --git a/debian/changelog b/debian/changelog
index 3e7af17..beb415f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mess (0.144-1) UNRELEASED; urgency=low
 
   * New upstream release, switching to mess.org zipfile as upstream
 tarball
+  * mess and mame-tools now built from the mess.org zipfile, independently from
+   mame
 
  -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 12:02:16 +0100
 

-- 
mess system 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


[SCM] mess system emulator branch, master, updated. 43b829e87f4255081f578f591a22076d32e3a75a

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 43b829e87f4255081f578f591a22076d32e3a75a
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 00:52:10 2011 +0100

typo

diff --git a/debian/changelog b/debian/changelog
index beb415f..f431f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mess (0.144-1) UNRELEASED; urgency=low
   * New upstream release, switching to mess.org zipfile as upstream
 tarball
   * mess and mame-tools now built from the mess.org zipfile, independently from
-   mame
+mame
 
  -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 12:02:16 +0100
 

-- 
mess system 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


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

2011-12-01 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit f43939f4c483236ffb03324a6c4bf3886bc7c04d
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 00:36:34 2011 +0100

Remove packages built from the MESS source package

diff --git a/debian/control b/debian/control
index d75011e..d490360 100644
--- a/debian/control
+++ b/debian/control
@@ -37,65 +37,6 @@ Description: Multiple Arcade Machine Emulator (MAME)
  .
  This package provides the MAME binary and configuration files.
 
-Package: mame-tools
-Section: non-free/utils
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: mame (= ${source:Version})
-Breaks: xmame-tools ( 0.140), sdlmame-tools ( 0.143)
-Description: Tools for Multiple Arcade Machine Emulator (MAME)
- MAME is a hardware emulator: it faithfully reproduces the behavior of many
- arcade machines (it is not a simulation). This program is not a game but can
- directly, through ROM images, run the complete system of these old arcade
- machines. These ROMs are subject to copyright and it is in most of the cases
- illegal to use them if you do not own the arcade machine.
- .
- This package provides tools to be used with MAME and MESS. It currently
- contains:
-  castool -- generic cassette manipulation tool for MESS
-  chdman -- MAME Compressed Hunks of Data CHD manager
-  imgtool -- generic image manipulation tool for MESS
-  jedutil -- binary to/from JEDEC file converter
-  ldresample -- Laserdisc audio synchronizer and resampler
-  ldverify -- Laserdisc AVI/CHD verifier
-  romcmp -- ROM comparison utility program
-  testkeys -- keyboard code viewer
-
-Package: mess
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mess-data
-Recommends: mess-desktop-entries
-Suggests: mame-tools
-Provides: xmess-common, xmess-sdl, xmess-x
-Replaces: xmess-common ( 0.142), xmess-sdl ( 0.142), xmess-x ( 0.142)
-Breaks: xmess-common ( 0.142), xmess-sdl ( 0.142), xmess-x ( 0.142)
-Description: Multi Emulator Super System (MESS)
- MESS is an emulator for various consoles and computing systems, sharing a
- lot of codebase with the MAME project.
- .
- Some of the well known consoles and computers emulated are the Atari 2600,
- Lynx, NES, SNES, Nintendo 64, GameBoy, Sega Master System, Sega Megadrive,
- Game Gear, Colecovision, Vectrex, Apple II, Atari 400/800, Commodore 64/128,
- IBM PC XT and AT (MDA and CGA), ZX80, ZX Spectrum, TI99/4, TRS-80, and the
- MSX.
- .
- This package provides the MESS binary and configuration files.
-
-Package: mess-data
-Architecture: all
-Depends: ${misc:Depends}
-Description: Data files for the Multi Emulator Super System (MESS)
- MESS is an emulator for various consoles and computing systems, sharing a
- lot of codebase with the MAME project.
- .
- Some of the well known consoles and computers emulated are the Atari 2600,
- Lynx, NES, SNES, Nintendo 64, GameBoy, Sega Master System, Sega Megadrive,
- Game Gear, Colecovision, Vectrex, Apple II, Atari 400/800, Commodore 64/128,
- IBM PC XT and AT (MDA and CGA), ZX80, ZX Spectrum, TI99/4, TRS-80, and the
- MSX.
- .
- This package provides the MESS hash files, keymaps and artwork.
-
 Package: xmame-sdl
 Depends: mame, ${misc:Depends}
 Architecture: all
@@ -117,37 +58,9 @@ Description: Transitional package for xmame-x
  This is a transitional package for xmame-x, and can be safely removed
  after the installation is complete.
 
-Package: xmame-tools
-Depends: mame, ${misc:Depends}
-Architecture: all
-Description: Transitional package for mame-tools
- This is a transitional package for mame-tools, and can be safely removed
- after the installation is complete.
-
-Package: xmess-sdl
-Depends: mess, ${misc:Depends}
-Architecture: all
-Description: Transitional package for xmess-sdl
- This is a transitional package for xmess-sdl, and can be safely removed
- after the installation is complete.
-
-Package: xmess-x
-Depends: mess, ${misc:Depends}
-Architecture: all
-Description: Transitional package for xmess-x
- This is a transitional package for xmess-x, and can be safely removed
- after the installation is complete.
-
 Package: sdlmame
 Depends: mame, ${misc:Depends}
 Architecture: amd64 i386
 Description: Transitional package for sdlmame
  This is a transitional package for sdlmame, and can be safely removed
  after the installation is complete.
-
-Package: sdlmame-tools
-Depends: mame-tools, ${misc:Depends}
-Architecture: amd64 i386
-Description: Transitional package for sdlmame-tools
- This is a transitional package for sdlmame-tools, and can be safely removed
- after the installation is complete.

-- 
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


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

2011-12-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit add7e0462926bc8d99fcc1749e02cd67ab4a7d3e
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 12:50:19 2011 +0100

Remove unused override

diff --git a/debian/mame.lintian-overrides b/debian/mame.lintian-overrides
index c9bd942..c16c05e 100644
--- a/debian/mame.lintian-overrides
+++ b/debian/mame.lintian-overrides
@@ -1,6 +1,5 @@
 # Allow empty folders for MAME
 # http://lintian.debian.org/manual/ch2.html
-mame binary: package-contains-empty-directory usr/share/games/mame/artwork/
 mame binary: package-contains-empty-directory usr/share/games/mame/cheat/
 mame binary: package-contains-empty-directory usr/share/games/mame/crosshair/
 mame binary: package-contains-empty-directory usr/share/games/mame/ctrlr/

-- 
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


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

2011-12-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit b359ca74f22b978f89580ab574c00fae23b08036
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 16:03:03 2011 +0100

Correct copyright synthax

diff --git a/debian/copyright b/debian/copyright
index bb33a62..60b7f56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format-Specification: 
http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208view=co
 Upstream-Name: MAME
 Source: http://mamedev.org and http://mess.redump.net. The mess source code is 
a source code layer which is added to the mame source code for building.
-The mame icons are part of the hydroxygen icon set, downloaded from 
-http://deviantdark.deviantart.com/art/hydroxygen-iconset-100826865
+ The mame icons are part of the hydroxygen icon set, downloaded from 
+ http://deviantdark.deviantart.com/art/hydroxygen-iconset-100826865
 Disclaimer: 
  This package is not part of the GNU/Linux Debian distribution.  It is
  provided in the non-free archive area as a convenience to Debian users.

-- 
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


[SCM] mess system emulator branch, master, updated. c4622885eb8b502954fc9fec2fb65d22d5d75559

2011-12-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit c4622885eb8b502954fc9fec2fb65d22d5d75559
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 16:02:29 2011 +0100

Correct copyright synthax

diff --git a/debian/copyright b/debian/copyright
index c7732d1..b68e99b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: 
http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208view=co
 Upstream-Name: MAME
 Source: http://mamedev.org and http://mess.redump.net. The mess source code is 
a source code layer which is added to the mame source code for building.
-The mame icons are part of the hydroxygen icon set, downloaded from 
-http://deviantdark.deviantart.com/art/hydroxygen-iconset-100826865
+ The mame icons are part of the hydroxygen icon set, downloaded from 
+ http://deviantdark.deviantart.com/art/hydroxygen-iconset-100826865
 Disclaimer: 
  This package is not part of the GNU/Linux Debian distribution.  It is
  provided in the non-free archive area as a convenience to Debian users.

-- 
mess system 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


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

2011-12-02 Thread Emmanuel Kasper
The following commit has been merged in the master branch:
commit 8525d2fbade5ae7e1440ec0370dd6f59116bd1b0
Author: Emmanuel Kasper emman...@libera.cc
Date:   Fri Dec 2 20:55:17 2011 +0100

changelog

diff --git a/debian/changelog b/debian/changelog
index 98a4e90..3456d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mame (0.144-1) UNRELEASED; urgency=low
 
 [Emmanuel Kasper]
   * New upstream release, handling of mess commented out
+  * Mame-tools are not built from the mame source package anymore, but from the
+  mess source package
 
  -- Emmanuel Kasper emman...@libera.cc  Sun, 20 Nov 2011 23:44:36 +0100
 

-- 
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


  1   2   >