[SCM] mess system emulator tag, debian/0.146-2, created. 338ad1677228eea1545dd41aa93b0e45a83772fd
The tag, debian/0.146-2 has been created at 338ad1677228eea1545dd41aa93b0e45a83772fd (commit) - Shortlog commit 338ad1677228eea1545dd41aa93b0e45a83772fd Author: Emmanuel Kasper emman...@libera.cc Date: Thu Aug 2 09:47:10 2012 +0200 Upload to unstable --- -- 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 annotated tag, debian/0.146-2, created. debian/0.146-2
The annotated tag, debian/0.146-2 has been created at be31f85ef98c07c0b6ef7f81e610390e023d34c1 (tag) tagging fa5d6ff6aaa3c63484e11d92ccf1ec3de517fe05 (commit) tagged by Emmanuel Kasper on Wed Aug 1 17:19:02 2012 +0200 - Shortlog 0.146-2 upload to unstable Cesare Falco (41): Initial merge from Ubuntu package Fixed manpages Regenerated patches with CR-stripped source. Some reformatting and clean-up in various files Fixed build clean targets for ldplayer Fixed typos in source to stop lintian complaints Fixed typo in mess manpage Fixed section in mess manpage Fixed section in mame manpage Refreshed patch series to fix mame manpage Add another mess typo to proper patch More minor fixes suggested by lintian Handled spaces within filenames in CR's trimming Included artwork files Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame Add makefile switch for system jpeg library Add custom libjpeg library path to linker Add /usr/local/share/games/mame dirs set to path entries Refactored mame.install Get rid of mess debris Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame Add local/ dirs to path in mame.ini, changed mame.dirs accordingly Fix dependencies for Ubuntu backward compatibility Further fix for improved backward compatibility in Ubuntu Put back system rompath in mame.ini Fixed a couple of lintian warnings Updated changelog file add back /usr/share to rompath Moved nplayers in a supplemental source tarball Remove patch for 145u4 commited by mistake - sorry! Added tmpdir while repacking nplayers zip debian/rules only build mame, tools now come from mess source Delete obj directory in clean target Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame Delete patches accepted upstream Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame Fixed manpages: mame.6 jedutil.1 chdman.1 Updated and renamed manpage patch Fixed patches/series (forgot before, sorry) Start fullscreen until window mode issue solved in Ubuntu. Emmanuel Kasper (229): Change Homepage to standard MAME as SDLmame is now part of it. First try at get-source-orig Merge branch 'master' of git.shaperstudio.com:mamedeb clean and safe get-orig-source target Correct version number by adding a dot revert to wrong 0139 number until get-orig-source is fixed Upstream tarball should be ignored as well Correct Mame Version from 0139 to 0.139 and hack get-orig-source target Workaround for compiling unidasm.c on powerpc, thanks Julian Sikorski Re-Allow user specific config file in $HOME/.mame (upstream default ) Move Lenny specific stuff to Wiki in Mention /home/manu/.mame where needed escape $ in debian/rules properly Merge branch 'master' of git.shaperstudio.com:mamedeb Disable $HOME as Make expand it to the $HOME od the user running the build ! remove useless sed for UPSTREAM_VERSION Merge branch 'master' of git.shaperstudio.com:mamedeb User specific mame directories for roms are now looked in $HOME Add quick start paragraph Remove ~sid from debian pacakge version Include a mame-version top level folder in the tarball created by Switch to debian package format 3.0 Various nitpicks suggested by Jordi Mallach use -9 on gip to have the maximum compression Add autobuild header Deleted old copyright file Add a new copyright file, based on Cesare Falco's package Use World Rally as example. Cosmetic clean up New upstream release Correct Aaron Gilles Copyright to New BSD License Switch to a mirror working mirror ( semi official ) Remove trailing whitespace Bump Standards-Version to 3.9.1 Switch to bzip2 for creating the upstream .orig tarball Add virtual packages for easy upgrading from xmame package Add full text of BSD licensed code as required by linitian Correct Lintian warning about section Add missing versioning for mame-tools virtual packages Improve wording on Roms copyright issues, correct typo Describe renamed mame-tools binaries with their proper names Correct Typo on xmame-common pacakge name Clarify README Cosmetic man pages improvements Specify exact debhelper version to make lintian happy Add override_dh_auto_build so we can pass to Make our own build options Upstream sources are now archived with tar and bz2 Switch to OFFICIAL mirror for get-orig-source Add working wathc file, based on ubuntu package
[SCM] packaging for the mame arcade game emulator branch, master, updated. fa5d6ff6aaa3c63484e11d92ccf1ec3de517fe05
The following commit has been merged in the master branch: commit fa5d6ff6aaa3c63484e11d92ccf1ec3de517fe05 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jul 30 17:22:52 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 58ddb39..6598faa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mame (0.146-2) UNRELEASED; urgency=low +mame (0.146-2) unstable; urgency=low [ Cesare Falco ] * mame.ini: start mame in full screen until issue solved in Ubuntu, see: -- 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. 5c7c815a3b446c1f67313d69137b5743545f7004
The following commit has been merged in the master branch: commit 5c7c815a3b446c1f67313d69137b5743545f7004 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jul 19 22:24:51 2012 +0200 Default gcc optimize flag switched to -O2 (-O3 segfaults on arm and i386) diff --git a/debian/changelog b/debian/changelog index 7a1b7b6..4d74484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,11 @@ mame (0.146-2) UNRELEASED; urgency=low - * Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary -on some arches (workaround for #678249) * Man page updated to 0.146 (Cesare Falco) * mame.ini: start mame in full screen until issue solved in Ubuntu, see: https://bugs.launchpad.net/ubuntu/+source/mame/+bug/994508 (Cesare Falco) - - -- Emmanuel Kasper emman...@libera.cc Thu, 28 Jun 2012 12:26:38 +0200 + * Default gcc optimize flag switched to -O2 (-O3 segfaults on arm and i386) + -- Emmanuel Kasper emman...@libera.cc Thu, 19 Jul 2012 22:15:16 +0200 mame (0.146-1) unstable; 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] packaging for the mame arcade game emulator branch, master, updated. 7162c56f91963ce2945626219b1d7c1951e0a983
The following commit has been merged in the master branch: commit 7162c56f91963ce2945626219b1d7c1951e0a983 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jul 19 22:28:17 2012 +0200 Remove depency on gcc-4.6 (should have been part of previous commit) diff --git a/debian/control b/debian/control index c2f284c..2f34a86 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,6 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), - gcc-4.6, - g++-4.6, libexpat1-dev, libflac-dev, libgconf2-dev, diff --git a/debian/rules b/debian/rules index 362107f..4380a51 100755 --- a/debian/rules +++ b/debian/rules @@ -44,12 +44,12 @@ DEB_MAME_OPTS = \ PROFILE= \ MAP= \ VERBOSE= \ -OPTIMIZE=3 \ +OPTIMIZE=2 \ LDFLAGS=-Wl,--as-needed \ LDFLAGSEMULATOR=-Wl,--as-needed \ NOWERROR=1 \ -CC=@gcc-4.6 \ -LD=@g++-4.6 +CC=@gcc +LD=@g++ # 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] packaging for the mame arcade game emulator branch, master, updated. 63d392d04d4676d349ec5139aad1ec430ea1c783
The following commit has been merged in the master branch: commit 63d392d04d4676d349ec5139aad1ec430ea1c783 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jul 19 23:06:06 2012 +0200 Remove useless CC/LD macros diff --git a/debian/rules b/debian/rules index 4380a51..db830c4 100755 --- a/debian/rules +++ b/debian/rules @@ -48,8 +48,6 @@ DEB_MAME_OPTS = \ LDFLAGS=-Wl,--as-needed \ LDFLAGSEMULATOR=-Wl,--as-needed \ NOWERROR=1 \ -CC=@gcc -LD=@g++ # 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] packaging for the mame arcade game emulator branch, master, updated. 63d392d04d4676d349ec5139aad1ec430ea1c783
The following commit has been merged in the master branch: commit 817868192f35372507514fc18a861bcc51f1761b Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jul 19 22:58:08 2012 +0200 Reformat changelog properly for Cesare's work diff --git a/debian/changelog b/debian/changelog index 4d74484..58ddb39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ mame (0.146-2) UNRELEASED; urgency=low - * Man page updated to 0.146 (Cesare Falco) + [ Cesare Falco ] * mame.ini: start mame in full screen until issue solved in Ubuntu, see: https://bugs.launchpad.net/ubuntu/+source/mame/+bug/994508 -(Cesare Falco) + * Man page updated to 0.146 + + [ Emmanuel Kasper ] * Default gcc optimize flag switched to -O2 (-O3 segfaults on arm and i386) + -- Emmanuel Kasper emman...@libera.cc Thu, 19 Jul 2012 22:15:16 +0200 mame (0.146-1) unstable; 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] mess system emulator branch, master, updated. d555dc729a39c12f50da82d3763758d03d904b13
The following commit has been merged in the master branch: commit d555dc729a39c12f50da82d3763758d03d904b13 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jul 19 23:02:55 2012 +0200 Default gcc optimize flag switched to -O2 (-O3 segfaults on i386) diff --git a/debian/changelog b/debian/changelog index 7b0f8b0..03588fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ mess (0.146-2) UNRELEASED; urgency=low - * Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary -on i386. - + * Default gcc optimize flag switched to -O2 (-O3 segfaults on i386) + Closes: #681915 + -- Emmanuel Kasper emman...@libera.cc Mon, 02 Jul 2012 16:03:03 +0200 mess (0.146-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 05f11d9..6a29c40 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,6 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), - gcc-4.6, - g++-4.6, libexpat1-dev, libgconf2-dev, libgtk2.0-dev, diff --git a/debian/rules b/debian/rules index ecaf683..1ff1233 100755 --- a/debian/rules +++ b/debian/rules @@ -38,12 +38,10 @@ DEB_MAME_OPTS = \ PROFILE= \ MAP= \ VERBOSE= \ -OPTIMIZE=3 \ +OPTIMIZE=2 \ LDFLAGS=-Wl,--as-needed \ LDFLAGSEMULATOR=-Wl,--as-needed \ NOWERROR=1 \ -CC=@gcc-4.6 \ -LD=@g++-4.6 DEB_MESS_OPTS = \ $(DEB_MAME_OPTS) \ -- 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. b64a76cd0f4d6563ccc47b3f49c6546ed011ada3
The following commit has been merged in the master branch: commit b64a76cd0f4d6563ccc47b3f49c6546ed011ada3 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Jul 4 16:25:59 2012 +0200 Don't close #678249 in the changelog as it most likely a gcc bug diff --git a/debian/changelog b/debian/changelog index 6f0374e..59fd1f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ mame (0.146-2) UNRELEASED; urgency=low * Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary - on some arches (closes: #678249) + on some arches (workaround for #678249) * Man page updated to 0.146 (Cesare Falco) -- Emmanuel Kasper emman...@libera.cc Thu, 28 Jun 2012 12:26:38 +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] mess system emulator branch, master, updated. 5bfb3976b9ea8f5eb1f362e7920d725c6ae59d4f
The following commit has been merged in the master branch: commit 5bfb3976b9ea8f5eb1f362e7920d725c6ae59d4f Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jul 2 16:20:31 2012 +0200 Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary on i386. diff --git a/debian/changelog b/debian/changelog index b68cd17..7b0f8b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mess (0.146-2) UNRELEASED; urgency=low + + * Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary +on i386. + + -- Emmanuel Kasper emman...@libera.cc Mon, 02 Jul 2012 16:03:03 +0200 + mess (0.146-1) unstable; urgency=low [ Emmanuel Kasper ] diff --git a/debian/control b/debian/control index 6a29c40..05f11d9 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,8 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), + gcc-4.6, + g++-4.6, libexpat1-dev, libgconf2-dev, libgtk2.0-dev, diff --git a/debian/rules b/debian/rules index 552fc3b..ecaf683 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,9 @@ DEB_MAME_OPTS = \ OPTIMIZE=3 \ LDFLAGS=-Wl,--as-needed \ LDFLAGSEMULATOR=-Wl,--as-needed \ -NOWERROR=1 +NOWERROR=1 \ +CC=@gcc-4.6 \ +LD=@g++-4.6 DEB_MESS_OPTS = \ $(DEB_MAME_OPTS) \ -- 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. ab316e91b12d86a260dfae2fd145e941d09a57d8
The following commit has been merged in the master branch: commit ab316e91b12d86a260dfae2fd145e941d09a57d8 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jun 28 12:30:54 2012 +0200 Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary on some arches (closes: #678249) diff --git a/debian/changelog b/debian/changelog index 0b949f4..6f0374e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mame (0.146-2) UNRELEASED; urgency=low + + * Recompile package with gcc-4.6, as gcc-4.7 segfaults the resulting binary + on some arches (closes: #678249) + * Man page updated to 0.146 (Cesare Falco) + -- Emmanuel Kasper emman...@libera.cc Thu, 28 Jun 2012 12:26:38 +0200 + mame (0.146-1) unstable; urgency=low [ Emmanuel Kasper ] diff --git a/debian/control b/debian/control index 2f34a86..c2f284c 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,8 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), + gcc-4.6, + g++-4.6, libexpat1-dev, libflac-dev, libgconf2-dev, diff --git a/debian/rules b/debian/rules index e642e1c..362107f 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,9 @@ DEB_MAME_OPTS = \ OPTIMIZE=3 \ LDFLAGS=-Wl,--as-needed \ LDFLAGSEMULATOR=-Wl,--as-needed \ -NOWERROR=1 +NOWERROR=1 \ +CC=@gcc-4.6 \ +LD=@g++-4.6 # 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] mess system emulator branch, master, updated. ad7ed655305ef10b57ae213808f364b2f76c83cb
The following commit has been merged in the master branch: commit fd9a6aa8c09457879691a499a27a9e19aa7b55b6 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jun 18 23:37:15 2012 +0200 Remove fix_mame_manpage_section.patch: it was unused diff --git a/debian/patches/fix_mame_manpage_section.patch b/debian/patches/fix_mame_manpage_section.patch deleted file mode 100644 index 01ae4b7..000 --- a/debian/patches/fix_mame_manpage_section.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Cesare Falco cesare.fa...@gmail.com -Subject: Fix section in mame manpage -Index: mame-0.142/src/osd/sdl/man/mame.1 -=== mame-0.142.orig/src/osd/sdl/man/mame.1 2011-06-16 09:58:20.0 +0200 -+++ mame-0.142/src/osd/sdl/man/mame.1 2011-06-16 09:58:39.0 +0200 -@@ -1,6 +1,6 @@ - .\ -*- nroff -*- - .\ --.\ mame.1 -+.\ mame.6 - .\ - .\ Man page created from usage and source information: - .\ * commands: see src/emu/clifront.c clifront.h -@@ -13,7 +13,7 @@ - .\ and updated by Andrew Burton burt...@gol.com, July 2003 - .\ - .\ --.TH MAME 1 2010-07-07 0.138u4 MAME - The Multiple Arcade Machine Emulator -+.TH MAME 6 2010-07-07 0.138u4 MAME - The Multiple Arcade Machine Emulator - .\ - .\ - .\ NAME chapter diff --git a/debian/patches/series b/debian/patches/series index eb1f11b..6fa1ae7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ gnu_fixes.patch -fix_mame_manpage_section.patch -- 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. ad7ed655305ef10b57ae213808f364b2f76c83cb
The following commit has been merged in the master branch: commit ad7ed655305ef10b57ae213808f364b2f76c83cb Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jun 18 23:40:02 2012 +0200 Remove fix_mame_manpage_section.patch as it was unused diff --git a/debian/changelog b/debian/changelog index d438aae..5169aca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ mess (0.146-1) UNRELEASED; urgency=low * Switch to http://www.progettosnaps.net/MESS/src/ for get-orig-source * Drop patches to link with flac and jpeg system lib: this has been pushed upstream by Cesare Falco. - + * Remove fix_mame_manpage_section.patch as it was unused -- Emmanuel Kasper emman...@libera.cc Tue, 29 May 2012 16:15:04 +0200 mess (0.145-1) unstable; urgency=low -- 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. f53cecb0670681980f1ad3263c51212e28ccb6f8
The following commit has been merged in the master branch: commit f53cecb0670681980f1ad3263c51212e28ccb6f8 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jun 11 12:33:20 2012 +0200 Drop patches to link with flac and jpeg system lib: all this has been pushed upstream by Cesare Falco. diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch deleted file mode 100644 index 31c7ed3..000 --- a/debian/patches/build_with_system_flac.patch +++ /dev/null @@ -1,74 +0,0 @@ -Author: Emmanuel Kasper emman...@libera.cc -Description: Add new makefile switch to allow the use of system flac headers -Forwarded: no - a/makefile -+++ b/makefile -@@ -217,6 +217,9 @@ - # uncomment next line to build jpeglib as part of MAME build - BUILD_JPEGLIB = 1 - -+# uncomment next line to build libflac as part of MAME build -+BUILD_FLAC = 1 -+ - # specify symbols level or leave commented to use the default - # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) - # SYMLEVEL = 2 -@@ -414,8 +417,9 @@ - endif - - # need to ensure FLAC functions are statically linked -+ifeq ($(BUILD_FLAC),1) - DEFS += -DFLAC__NO_DLL -- -+endif - - - #- -@@ -640,6 +644,15 @@ - JPEG_LIB = - endif - -+# add flac library -+ifeq ($(BUILD_FLAC),1) -+INCPATH += -I$(SRC)/lib/libflac/include -+FLAC_LIB = $(OBJ)/libflac.a -+else -+LIBS += -lFLAC -+FLAC_LIB = -+endif -+ - #- - # 'default' target needs to go here, before the - # include files which define additional targets -@@ -649,8 +662,6 @@ - - all: default tools - --FLAC_LIB = $(OBJ)/libflac.a --# $(OBJ)/libflac++.a - - - #- a/src/emu/sound/samples.c -+++ b/src/emu/sound/samples.c -@@ -16,7 +16,7 @@ - #include emu.h - #include emuopts.h - #include samples.h --#include ../../lib/libflac/include/flac/all.h -+#include FLAC/all.h - - typedef struct _sample_channel sample_channel; - struct _sample_channel a/src/lib/util/chd.c -+++ b/src/lib/util/chd.c -@@ -48,7 +48,7 @@ - #include stdlib.h - #include new - --#include ../../lib/libflac/include/flac/all.h -+#include FLAC/all.h - - - /*** diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch deleted file mode 100644 index 923ab0d..000 --- a/debian/patches/build_with_system_libjpeg.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: mame/makefile -=== mame.orig/makefile 2012-02-26 22:21:48.0 +0100 -+++ mame/makefile 2012-02-26 22:22:36.0 +0100 -@@ -214,6 +214,9 @@ - # uncomment next line to include the symbols - # SYMBOLS = 1 - -+# uncomment next line to build jpeglib as part of MAME build -+BUILD_JPEGLIB = 1 -+ - # specify symbols level or leave commented to use the default - # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) - # SYMLEVEL = 2 -@@ -628,7 +631,14 @@ - # add formats emulation library - FORMATS_LIB = $(OBJ)/libformats.a - -+# add jpeglib image library -+ifeq ($(BUILD_JPEGLIB),1) -+INCPATH += -I$(SRC)/lib/libjpeg - JPEG_LIB = $(OBJ)/libjpeg.a -+else -+LIBS += -ljpeg -+JPEG_LIB = -+endif - - #- - # 'default' target needs to go here, before the -Index: mame/src/mame/drivers/sliver.c -=== mame.orig/src/mame/drivers/sliver.c2012-02-26 22:21:48.0 +0100 -+++ mame/src/mame/drivers/sliver.c 2012-02-26 22:21:53.0 +0100 -@@ -67,7 +67,7 @@ - #include sound/okim6295.h - #include cpu/mcs51/mcs51.h - #include video/ramdac.h --#include ../../lib/libjpeg/jpeglib.h -+#include jpeglib.h - - - #define FIFO_SIZE 1024 -Index: mame/src/osd/osdcomm.h -=== mame.orig/src/osd/osdcomm.h2012-02-26 22:21:48.0 +0100 -+++ mame/src/osd/osdcomm.h 2012-02-26 22:21:53.0 +0100 -@@ -143,6 +143,10 @@ - - #endif - -+/* This should prevent libjpeg of typedef'ing INT32 */ -+#ifndef XMD_H -+#define XMD_H -+#endif - - - /*** diff --git a/debian/patches/series b/debian/patches/series index 556867f..eb1f11b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ gnu_fixes.patch fix_mame_manpage_section.patch -build_with_system_libjpeg.patch -build_with_system_flac.patch -- 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. 466675954d07ec957811949a190188ce22544a03
The following commit has been merged in the master branch: commit 466675954d07ec957811949a190188ce22544a03 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jun 11 12:39:05 2012 +0200 Changelog entry: Drop patches to link with flac and jpeg system lib: this has been pushed upstream by Cesare Falco. diff --git a/debian/changelog b/debian/changelog index a0dc8ea..d438aae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ mess (0.146-1) UNRELEASED; urgency=low * New upstream release * Add DM-Upload-Allowed: yes to debian/control as OK'ed by package sponsor * Switch to http://www.progettosnaps.net/MESS/src/ for get-orig-source + * Drop patches to link with flac and jpeg system lib: this has been pushed + upstream by Cesare Falco. -- Emmanuel Kasper emman...@libera.cc Tue, 29 May 2012 16:15:04 +0200 -- 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. 16df64b448bc3ec71b0d9c1e1b94c8cff46b6181
The following commit has been merged in the master branch: commit 16df64b448bc3ec71b0d9c1e1b94c8cff46b6181 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Jun 6 12:14:40 2012 +0200 Switch to http://www.progettosnaps.net/MESS/src/ for get-orig-source diff --git a/debian/changelog b/debian/changelog index 4c6ddbe..a0dc8ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mess (0.146-1) UNRELEASED; urgency=low * New upstream release * Add DM-Upload-Allowed: yes to debian/control as OK'ed by package sponsor + * Switch to http://www.progettosnaps.net/MESS/src/ for get-orig-source -- Emmanuel Kasper emman...@libera.cc Tue, 29 May 2012 16:15:04 +0200 -- 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, upstream, deleted. b1eb8165dc40f9ba05235c7b0047aa94944bf593
The branch, upstream has been deleted was b1eb8165dc40f9ba05235c7b0047aa94944bf593 --- b1eb8165dc40f9ba05235c7b0047aa94944bf593 Add missing mame source bits --- -- 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. c2ad9669d116c3851d4427378f3276d2777a78d7
The following commit has been merged in the master branch: commit c2ad9669d116c3851d4427378f3276d2777a78d7 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jun 4 21:54:06 2012 +0200 Update copyright file to 0.146 diff --git a/debian/copyright b/debian/copyright index b82aff0..c19314b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -68,283 +68,178 @@ Copyright: R. Belmont O. Galibert License: MAME or LGPL-2.1 -Files: src/osd/osdepend.c - src/osd/windows/drawd3d.c - src/osd/windows/main.c - src/osd/windows/wintime.c - src/osd/windows/winfile.c - src/osd/windows/d3d9intf.c - src/osd/windows/winutf8.c - src/osd/windows/window.c - src/osd/windows/drawdd.c - src/osd/windows/winmain.c - src/osd/windows/d3d8intf.c - src/osd/windows/ledutil.c - src/osd/windows/winutil.c - src/osd/windows/winutf8.h - src/osd/windows/sound.c - src/osd/windows/winwork.c - src/osd/windows/debugwin.h - src/osd/windows/output.c - src/osd/windows/strconv.c - src/osd/windows/osinline.h - src/osd/windows/windows.mak - src/osd/windows/strconv.h - src/osd/windows/eivc.h - src/osd/windows/winmain.h - src/osd/windows/winmenu.c - src/osd/windows/winclip.c - src/osd/windows/window.h - src/osd/windows/input.c - src/osd/windows/sound.h - src/osd/windows/winmisc.c - src/osd/windows/d3dintf.h - src/osd/windows/eivcx86.h - src/osd/windows/video.c - src/osd/windows/winprefix.h - src/osd/windows/winutil.h - src/osd/windows/drawnone.c - src/osd/windows/debugwin.c - src/osd/windows/winalloc.c - src/osd/windows/input.h - src/osd/windows/video.h - src/osd/windows/winsync.c - src/osd/windows/drawgdi.c - src/osd/windows/output.h - src/osd/windows/mame.rc - src/osd/windows/windir.c - src/osd/windows/vconv.c - src/osd/osdmini/osdmini.h - src/osd/osdmini/minimisc.c - src/osd/osdmini/miniwork.c - src/osd/osdmini/minidir.c - src/osd/osdmini/minitime.c - src/osd/osdmini/minifile.c - src/osd/osdmini/minimain.c - src/osd/osdmini/minisync.c - src/osd/osdmini/osdmini.mak - src/osd/osdcore.h - src/osd/osdepend.h - src/osd/osdcomm.h - src/tools/split.c - src/tools/tools.mak - src/tools/chdman.c - src/tools/srcclean.c - src/tools/src2html.c - src/tools/unidasm.c - src/tools/jedutil.c - src/tools/regrep.c - src/tools/ldverify.c - src/tools/ldresample.c - src/mame/machine/atarigen.h - src/mame/machine/atarigen.c - src/emu/rendfont.c - src/emu/video/voodoo.h - src/emu/video/voodoo.c - src/emu/video/vooddefs.h - src/emu/emu.h - src/emu/didisasm.c - src/emu/hash.c - src/emu/emualloc.h - src/emu/dimemory.c - src/emu/hash.h - src/emu/timer.c - src/emu/emuopts.c - src/emu/emuopts.h - src/emu/dinvram.c - src/emu/disound.c - src/emu/rendlay.h - src/emu/fileio.c - src/emu/mconfig.c - src/emu/cheat.c - src/emu/screen.h - src/emu/rendlay.c - src/emu/memory.h - src/emu/disound.h - src/emu/sound.c +Files: src/emu/mconfig.c + src/emu/mconfig.h src/emu/memory.c - src/emu/distate.c - src/emu/timer.h - src/emu/devlegcy.h - src/emu/machine.c - src/emu/devcpu.h - src/emu/addrmap.h - src/emu/emutempl.h - src/emu/attotime.h - src/emu/addrmap.c - src/emu/rendfont.h - src/emu/sound.h - src/emu/state.h - src/emu/drivers/emudummy.c - src/emu/debug/dvtext.h - src/emu/debug/debugvw.h - src/emu/debug/dvtext.c - src/emu/debug/dvstate.h - src/emu/debug/debugcpu.h - src/emu/debug/express.c - src/emu/debug/dvmemory.c - src/emu/debug/dvdisasm.c - src/emu/debug/dvdisasm.h - src/emu/debug/debugvw.c - src/emu/debug/debugcpu.c - src/emu/debug/dvmemory.h - src/emu/debug/express.h - src/emu/debug/dvstate.c + src/emu/memory.h src/emu/profiler.c - src/emu/machine.h - src/emu/clifront.c - src/emu/cheat.h - src/emu/diexec.c - src/emu/delegate.h - src/emu/speaker.h - src/emu/delegate.c + src/emu/profiler.h + src/emu/render.c src/emu/render.h - src/emu/screen.c + src/emu/rendfont.c + src/emu/rendfont.h + src/emu/rendlay.c + src/emu/rendlay.h src/emu/schedule.c - src/emu/video.c src/emu/schedule.h - src/emu/devcpu.c - src/emu/dinvram.h - src/emu/attotime.c - src/emu/profiler.h - src/emu/diexec.h - src/emu/clifront.h + src/emu/screen.c + src/emu/screen.h src/emu/sound/bsmt2000.c src/emu/sound/bsmt2000.h - src/emu/video.h - src/emu/devlegcy.c - src/emu/state.c - src/emu/render.c - src/emu/fileio.h - src/emu/distate.h - src/emu/emualloc.c - src/emu/machine/i8243.h - src/emu/machine/nvram.h - src/emu/machine/nvram.c - src/emu/machine/i8243.c - src/emu/machine/er2055.h - src/emu/machine/er2055.c + src/emu/sound.c + src/emu/sound.h src/emu/speaker.c - src/emu/cpu/drcbex86.c - src/emu/cpu/drccache.h - src/emu/cpu/drcbex86.h - src/emu/cpu/drcfe.c - src/emu/cpu/x86log.c - src/emu/cpu/drcbeut.c - src/emu/cpu/drcumlsh.h - src/emu/cpu/drcbeut.h - src/emu/cpu/drcuml.h - src/emu/cpu/vtlb.c - src/emu/cpu/tms32031/tms32031.h - src/emu/cpu/tms32031/tms32031.c - src/emu/cpu/tms32031/32031ops.c - src/emu/cpu/ccpu/ccpu.c - src/emu/cpu/drcbex64.h - src/emu/cpu/x86emit.h - src/emu/cpu/drcuml.c - src/emu/cpu/drcbec.h - src/emu/cpu/drcbec.c - src/emu/cpu/asap/asap.h - src/emu/cpu/asap/asap.c - src/emu
[SCM] packaging for the mame arcade game emulator branch, master, updated. 585614c8f6516551326fb82df28f70488109f2de
The following commit has been merged in the master branch: commit 585614c8f6516551326fb82df28f70488109f2de Merge: 1bf03c0a8cbfa0e0b51f6783d7293e29b0231177 a9950ceb622c3e88ab53d8daa873c3efa99c67ae Author: Emmanuel Kasper emman...@libera.cc Date: Tue May 29 13:03:10 2012 +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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] mess system emulator branch, master, updated. 094a69ec66c470dda5bb35042296450e0b281b0e
The following commit has been merged in the master branch: commit 094a69ec66c470dda5bb35042296450e0b281b0e Author: Emmanuel Kasper emman...@libera.cc Date: Tue May 29 16:21:37 2012 +0200 Use more up-to-date upstream mirror to get the source diff --git a/debian/rules b/debian/rules index 5859491..233eae6 100755 --- a/debian/rules +++ b/debian/rules @@ -172,7 +172,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') MESS_PACKAGE = mess MESS_FILEBASE = $(MESS_PACKAGE)$(VERSION) -MESS_URL = http://ftp.fr.netbsd.org/pub/NetBSD/packages/distfiles/ +MESS_URL = http://www.progettosnaps.net/MESS/src/ AGENT = Debian MAME/MESS Packagers m...@packages.debian.org TMPDIR := $(shell mktemp --dry-run --directory -p .) -- 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. 440f5176eddf9efd10c5f17afed667071af9ab25
The following commit has been merged in the master branch: commit 440f5176eddf9efd10c5f17afed667071af9ab25 Author: Emmanuel Kasper emman...@libera.cc Date: Tue May 29 16:38:10 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index a918180..59ce4f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mess (0.146-1) UNRELEASED; urgency=low + + * New upstream release + + -- Emmanuel Kasper emman...@libera.cc Tue, 29 May 2012 16:15:04 +0200 + mess (0.145-1) unstable; urgency=low [ Emmanuel Kasper ] -- 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. 585614c8f6516551326fb82df28f70488109f2de
The following commit has been merged in the master branch: commit 1bf03c0a8cbfa0e0b51f6783d7293e29b0231177 Author: Emmanuel Kasper emman...@libera.cc Date: Thu May 24 12:46:52 2012 +0200 Add DM-Upload-Allowed: yes field as it has been allowed by the package sponsor See: http://lists.alioth.debian.org/pipermail/pkg-games-devel/2012-May/022782.html diff --git a/debian/control b/debian/control index 1ec6797..2f34a86 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Emmanuel Kasper emman...@libera.cc, Ludovic Lechapt ludoma...@gmail.com, Jordi Mallach jo...@debian.org +DM-Upload-Allowed: yes Build-Depends: debhelper (= 8), libexpat1-dev, libflac-dev, -- 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. cad16a783d3fa6b3ad4a4aa60ffec44fd06708ee
The following commit has been merged in the master branch: commit cad16a783d3fa6b3ad4a4aa60ffec44fd06708ee Author: Emmanuel Kasper emman...@libera.cc Date: Tue May 29 16:01:32 2012 +0200 Group copyright attribution by license type diff --git a/debian/copyright b/debian/copyright index a19f082..b82aff0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,12 +14,6 @@ Copyright: Ludovic Lechapt ludoma...@gmail.com Mamedeb team m...@packages.debian.org License: GPL-2+ -Files: debian/rules -Copyright: Cesare Falco cesare.fa...@gmail.com - Ludovic Lechapt ludoma...@gmail.com - Mamedeb team m...@packages.debian.org -License: GPL-2+ - Files: debian/patches/* Copyright: Mamedeb team m...@packages.debian.org License: GPL-2+ or MAME @@ -30,227 +24,48 @@ License: GPL-3+ Files: * Copyright: Nicola Salmoria and the MAME team + Alex Pasadyn + Bryan McPhail + Dag Lem + Eric Smith + Frank Palazzolo + Grazvydas Ignotas + Jarek Burczynski + Jason Eckhardt + John Butler + John Weidman + Jonas Quinn + Jonathan Gevaryahu + Joseph Zbiciak + Juergen Buchmueller + J. Wallace + Karl Stenerud + Kris Bleakley + Lancer + Miodrag Milanovic + Mirko Buffoni + Nach + Peter J.C.Clare + Peter Trauner + Raphael Nabet + Ron Fries + smf + Steve Baines + Steve Ellenoff + Tatsuyuki Satoh + the AGEMAME Development Team + The MESS team + Tim Lindner + Tony La Porta + z80 gaiden + Zsolt Vasvari License: MAME -Files: src/emu/cpu/alph8201/* -Copyright: Tatsuyuki Satoh -License: MAME - -Files: src/emu/cpu/arm7/* - src/emu/cpu/mcs51/* -Copyright: Steve Ellenoff -License: MAME - -Files: src/emu/cpu/cdp1802/* - src/emu/cpu/lh5801/* - src/emu/cpu/saturn/* - src/emu/cpu/sc61860/* - src/emu/sound/sid.* -Copyright: Peter Trauner -License: MAME - -Files: src/emu/cpu/cp1610/* -Copyright: Frank Palazzolo -License: MAME - -Files: src/emu/cpu/f8/* - src/emu/cpu/i8085/* - src/emu/cpu/m6502/* - src/emu/cpu/sh2/* - src/emu/cpu/spc700/spc700ds.* - src/emu/cpu/upd7810/* - src/emu/cpu/z80/* - src/emu/cpu/z180/* - src/emu/cpu/z8000/* -Copyright: Juergen Buchmueller -License: MAME - -Files: src/emu/cpu/g65816/* - src/emu/cpu/m68000/* -Copyright: Karl Stenerud -License: MAME - -Files: src/emu/cpu/h6280/* -Copyright: Bryan McPhail -License: MAME - -Files: src/emu/cpu/hd6309/* -Copyright: John Butler, Tim Lindner -License: MAME - -Files: src/emu/cpu/i860/* -Copyright: Jason Eckhardt -License: MAME - -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 - 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/machine/im6402.c - src/emu/machine/im6402.h - src/emu/machine/pls100.c - src/emu/machine/pls100.h - 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
[SCM] packaging for the mame arcade game emulator branch, master, updated. 269fb78e1c804ab6a00dac4a6c633ba0be5139e2
The following commit has been merged in the master branch: commit 156a3542d1c846426e3d9f96b24bbcc2c881b284 Author: Emmanuel Kasper emman...@libera.cc Date: Mon May 21 15:29:20 2012 +0200 Remove revision numer to whatsnew as it has been dropped by upstream diff --git a/debian/rules b/debian/rules index c350c48..5d6f64b 100755 --- a/debian/rules +++ b/debian/rules @@ -153,7 +153,7 @@ override_dh_auto_clean: # dh_installchangelogs doesn't know about whatsnew.txt, # so we need to make an explicit call override_dh_installchangelogs: - dh_installchangelogs whatsnew_$(UPSTREAM_VERSION).txt + dh_installchangelogs whatsnew.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, master, updated. 269fb78e1c804ab6a00dac4a6c633ba0be5139e2
The following commit has been merged in the master branch: commit 7a305f43e27f28ada61dc4862dbf90dce9e400f1 Author: Emmanuel Kasper emman...@libera.cc Date: Mon May 21 15:26:33 2012 +0200 Remove patches to build with system flac and jpeg, as they have been upstreamed by Cesare. diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch deleted file mode 100644 index 31c7ed3..000 --- a/debian/patches/build_with_system_flac.patch +++ /dev/null @@ -1,74 +0,0 @@ -Author: Emmanuel Kasper emman...@libera.cc -Description: Add new makefile switch to allow the use of system flac headers -Forwarded: no - a/makefile -+++ b/makefile -@@ -217,6 +217,9 @@ - # uncomment next line to build jpeglib as part of MAME build - BUILD_JPEGLIB = 1 - -+# uncomment next line to build libflac as part of MAME build -+BUILD_FLAC = 1 -+ - # specify symbols level or leave commented to use the default - # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) - # SYMLEVEL = 2 -@@ -414,8 +417,9 @@ - endif - - # need to ensure FLAC functions are statically linked -+ifeq ($(BUILD_FLAC),1) - DEFS += -DFLAC__NO_DLL -- -+endif - - - #- -@@ -640,6 +644,15 @@ - JPEG_LIB = - endif - -+# add flac library -+ifeq ($(BUILD_FLAC),1) -+INCPATH += -I$(SRC)/lib/libflac/include -+FLAC_LIB = $(OBJ)/libflac.a -+else -+LIBS += -lFLAC -+FLAC_LIB = -+endif -+ - #- - # 'default' target needs to go here, before the - # include files which define additional targets -@@ -649,8 +662,6 @@ - - all: default tools - --FLAC_LIB = $(OBJ)/libflac.a --# $(OBJ)/libflac++.a - - - #- a/src/emu/sound/samples.c -+++ b/src/emu/sound/samples.c -@@ -16,7 +16,7 @@ - #include emu.h - #include emuopts.h - #include samples.h --#include ../../lib/libflac/include/flac/all.h -+#include FLAC/all.h - - typedef struct _sample_channel sample_channel; - struct _sample_channel a/src/lib/util/chd.c -+++ b/src/lib/util/chd.c -@@ -48,7 +48,7 @@ - #include stdlib.h - #include new - --#include ../../lib/libflac/include/flac/all.h -+#include FLAC/all.h - - - /*** diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch deleted file mode 100644 index b7f9b8e..000 --- a/debian/patches/build_with_system_libjpeg.patch +++ /dev/null @@ -1,61 +0,0 @@ -Author: Emmanuel Kasper emman...@libera.cc, Cesare Falco cesare.fa...@gmail.com -Description: Add new makefile switch to allow the use of jpeg system headers -Forwarded: http://forums.bannister.org/ubbthreads.php?ubb=showflatNumber=76614page=3 - -Index: mame/makefile -=== mame.orig/makefile 2012-02-26 22:21:48.0 +0100 -+++ mame/makefile 2012-02-26 22:22:36.0 +0100 -@@ -214,6 +214,9 @@ - # uncomment next line to include the symbols - # SYMBOLS = 1 - -+# uncomment next line to build jpeglib as part of MAME build -+BUILD_JPEGLIB = 1 -+ - # specify symbols level or leave commented to use the default - # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) - # SYMLEVEL = 2 -@@ -628,7 +631,14 @@ - # add formats emulation library - FORMATS_LIB = $(OBJ)/libformats.a - -+# add jpeglib image library -+ifeq ($(BUILD_JPEGLIB),1) -+INCPATH += -I$(SRC)/lib/libjpeg - JPEG_LIB = $(OBJ)/libjpeg.a -+else -+LIBS += -ljpeg -+JPEG_LIB = -+endif - - #- - # 'default' target needs to go here, before the -Index: mame/src/mame/drivers/sliver.c -=== mame.orig/src/mame/drivers/sliver.c2012-02-26 22:21:48.0 +0100 -+++ mame/src/mame/drivers/sliver.c 2012-02-26 22:21:53.0 +0100 -@@ -67,7 +67,7 @@ - #include sound/okim6295.h - #include cpu/mcs51/mcs51.h - #include video/ramdac.h --#include ../../lib/libjpeg/jpeglib.h -+#include jpeglib.h - - - #define FIFO_SIZE 1024 -Index: mame/src/osd/osdcomm.h -=== mame.orig/src/osd/osdcomm.h2012-02-26 22:21:48.0 +0100 -+++ mame/src/osd/osdcomm.h 2012-02-26 22:21:53.0 +0100 -@@ -143,6 +143,10 @@ - - #endif - -+/* This should prevent libjpeg of typedef'ing INT32 */ -+#ifndef XMD_H -+#define XMD_H -+#endif - - - /*** diff --git a/debian/patches/series b/debian/patches/series index ae971a2..7eab594 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ fix_mame_manpage_section.patch gnu_fixes.patch -build_with_system_libjpeg.patch -build_with_system_flac.patch -- packaging for the mame arcade game emulator
[SCM] packaging for the mame arcade game emulator branch, master, updated. 269fb78e1c804ab6a00dac4a6c633ba0be5139e2
The following commit has been merged in the master branch: commit 269fb78e1c804ab6a00dac4a6c633ba0be5139e2 Author: Emmanuel Kasper emman...@libera.cc Date: Mon May 21 15:34:41 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 8ec24b9..c7e2b16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mame (0.146-1) UNRELEASED; urgency=low + + [ Emmanuel Kasper ] + * New upstream release + * Drop patch to fix man pages section and patches to link with flac +and jpeg system lib: all this has been pushed upstream by Cesare Falco + + -- Emmanuel Kasper emman...@libera.cc Mon, 21 May 2012 15:03:21 +0200 + mame (0.145-1) 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] packaging for the mame arcade game emulator branch, master, updated. 269fb78e1c804ab6a00dac4a6c633ba0be5139e2
The following commit has been merged in the master branch: commit e57bfaa7cc9ddb199088976319d29088299170e2 Author: Emmanuel Kasper emman...@libera.cc Date: Mon May 21 15:28:30 2012 +0200 Remove pathc to place mame in section 6: it has been upstreamed diff --git a/debian/mame.manpages b/debian/mame.manpages index 4ec82d6..85356dc 100644 --- a/debian/mame.manpages +++ b/debian/mame.manpages @@ -1 +1 @@ -src/osd/sdl/man/mame.1 +src/osd/sdl/man/mame.6 diff --git a/debian/patches/series b/debian/patches/series index 7eab594..6fa1ae7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -fix_mame_manpage_section.patch gnu_fixes.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] mess system emulator branch, master, updated. 1a7861a3505e14ab84e46c887d8d197efc324495
The following commit has been merged in the master branch: commit 24a1a234b915ff81b0e9775f46463dd364696cb5 Author: Emmanuel Kasper emman...@libera.cc Date: Wed May 16 00:45:50 2012 +0200 Remove front slashes diff --git a/debian/mess-data.dirs b/debian/mess-data.dirs index 1bac5da..141e387 100644 --- a/debian/mess-data.dirs +++ b/debian/mess-data.dirs @@ -1,6 +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 +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 -- 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. 1a7861a3505e14ab84e46c887d8d197efc324495
The following commit has been merged in the master branch: commit 1a7861a3505e14ab84e46c887d8d197efc324495 Author: Emmanuel Kasper emman...@libera.cc Date: Wed May 16 00:46:18 2012 +0200 Mention copyright reformating diff --git a/debian/changelog b/debian/changelog index cff3b83..d02eb5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ mess (0.145-1) UNRELEASED; urgency=low * Use NetBSD distfiles as temporary source for downloading the source code * Add patch to disable static linking of libflac and libjpeg * Add BSD 3 clause license text in debian/copyright - + * Group per-author copyright information when the same license is used -- Emmanuel Kasper emman...@libera.cc Thu, 26 Apr 2012 14:34:53 +0200 mess (0.144-2) UNRELEASED; urgency=low -- 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. 1a7861a3505e14ab84e46c887d8d197efc324495
The following commit has been merged in the master branch: commit ef6a134d8699dc77c572df8fd7b198e2d51d227c Author: Emmanuel Kasper emman...@libera.cc Date: Wed May 16 00:36:18 2012 +0200 update to 0.145 diff --git a/debian/copyright b/debian/copyright index d89cfd7..6238b0b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -26,226 +26,47 @@ License: GPL-3+ Files: * Copyright: Nicola Salmoria and the MAME team -License: MAME - -Files: src/emu/cpu/alph8201/* -Copyright: Tatsuyuki Satoh -License: MAME - -Files: src/emu/cpu/arm7/* - src/emu/cpu/mcs51/* -Copyright: Steve Ellenoff -License: MAME - -Files: src/emu/cpu/cdp1802/* - src/emu/cpu/lh5801/* - src/emu/cpu/saturn/* - src/emu/cpu/sc61860/* - src/emu/sound/sid.* -Copyright: Peter Trauner -License: MAME - -Files: src/emu/cpu/cp1610/* -Copyright: Frank Palazzolo -License: MAME - -Files: src/emu/cpu/f8/* - src/emu/cpu/i8085/* - src/emu/cpu/m6502/* - src/emu/cpu/sh2/* - src/emu/cpu/spc700/spc700ds.* - src/emu/cpu/upd7810/* - src/emu/cpu/z80/* - src/emu/cpu/z180/* - src/emu/cpu/z8000/* -Copyright: Juergen Buchmueller -License: MAME - -Files: src/emu/cpu/g65816/* - src/emu/cpu/m68000/* -Copyright: Karl Stenerud -License: MAME - -Files: src/emu/cpu/h6280/* -Copyright: Bryan McPhail -License: MAME - -Files: src/emu/cpu/hd6309/* -Copyright: John Butler, Tim Lindner -License: MAME - -Files: src/emu/cpu/i860/* -Copyright: Jason Eckhardt -License: MAME - -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 - 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 - src/mess/machine/c2031.c - src/mess/machine/c2031.h - src/mess/machine/comx_clm.h - src/mess/machine/comx_eb.h - src/mess/machine/comx_epr.h - src/mess/machine/comx_fd.h - src/mess/machine/comx_joy.h - src/mess/machine/comx_prn.h - src/mess/machine/comx_ram.h - src/mess/machine/comx_thm.h - src/mess/machine/comxexp.c - src/mess/machine/comxexp.h - src/mess/machine/ecbbus.c - src/mess/machine/ecbbus.h - src/mess/machine/s100.c - src/mess/machine/s100.h - src/mess/machine/s100_dj2db.c - src/mess/machine/s100_dj2db.h - src/mess/machine/s100_djdma.c - src/mess/machine/s100_djdma.h - src/mess/machine/s100_mm65k16s.c - src/mess/machine/s100_mm65k16s.h - src/mess/machine/s100_wunderbus.c - src/mess/machine/s100_wunderbus.h - src/mess/machine/abc1600_bus.c - src/mess/machine/abc1600_bus.h - src/mess/machine/c64_std.c - src/mess/machine/c64_std.h - src/mess/machine/c64_xl80.h - src/mess/machine/c64exp.c - src/mess/machine/c64exp.h - src/mess/machine/d9060.c - src/mess/machine/d9060.h - src/mess/machine/isa_wdxt_gen.c - src/mess/machine
[SCM] mess system emulator branch, master, updated. b24fabd0b65cf16e4ba107a5ec2b291e9337b274
The following commit has been merged in the master branch: commit b24fabd0b65cf16e4ba107a5ec2b291e9337b274 Author: Emmanuel Kasper emman...@libera.cc Date: Sun May 13 10:56:45 2012 +0200 Correct synthax warning diff --git a/debian/copyright b/debian/copyright index 4855ec9..d89cfd7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -886,7 +886,7 @@ License: BSD-3-clause * Neither the name 'MAME' nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + . THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -- 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. 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366
The following commit has been merged in the master branch: commit c83f5a023ca7e8a7c78250111ad733d808e16a43 Author: Emmanuel Kasper emman...@libera.cc Date: Sun May 13 00:17:34 2012 +0200 Add full text of BSD license diff --git a/debian/copyright b/debian/copyright index d2cb68d..b2b063c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -826,14 +826,6 @@ License: MAME ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: BSD-3-clause - On Debian systems, the full text of the BSD three clauses license can be found - in the file /usr/share/common-licenses/BSD - -License: GPL-2 - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file /usr/share/common-licenses/GPL-2. - License: GPL-2+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -860,11 +852,6 @@ License: GPL-3+ On Debian systems, the full text of the GNU General Public License version 3 can be found in the file /usr/share/common-licenses/GPL-3. -License: LGPL-2.1 - On Debian systems, the full text of the GNU Lesser General Public - License version 2.1 can be found in the file - /usr/share/common-licenses/LGPL-2.1 - License: LGPL-2.1+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -885,5 +872,39 @@ License: LGPL-2.1+ License version 2.1 can be found in the file /usr/share/common-licenses/LGPL-2.1 +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. +* Neither the name 'MAME' nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +License: GPL-2 + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file /usr/share/common-licenses/GPL-2. +License: LGPL-2.1 + On Debian systems, the full text of the GNU Lesser General Public + License version 2.1 can be found in the file + /usr/share/common-licenses/LGPL-2.1 -- 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. 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366
The following commit has been merged in the master branch:
commit 475def059f5e3edb747c89230fa666cfd0e3b533
Author: Emmanuel Kasper emman...@libera.cc
Date: Sun May 13 00:22:34 2012 +0200
Bump Standards Version, replace metapackage with oldlibs section
diff --git a/debian/control b/debian/control
index 1559d06..5924935 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (= 8),
libsdl1.2-dev,
libsdl-ttf2.0-dev,
zlib1g-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Vcs-Git: git://anonscm.debian.org/pkg-games/mess.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/mess.git
Homepage: http://mess.org/
@@ -81,7 +81,7 @@ Description: Data files for the Multi Emulator Super System
(MESS)
This package provides the MESS hash files, keymaps and artwork.
Package: xmame-tools
-Section: non-free/metapackages
+Section: non-free/oldlibs
Priority: extra
Depends: mame-tools, ${misc:Depends}
Architecture: all
@@ -90,7 +90,7 @@ Description: Transitional package for mame-tools
after the installation is complete.
Package: xmess-sdl
-Section: non-free/metapackages
+Section: non-free/oldlibs
Priority: extra
Depends: mess, ${misc:Depends}
Architecture: all
@@ -99,7 +99,7 @@ Description: Transitional package for xmess-sdl
after the installation is complete.
Package: xmess-x
-Section: non-free/metapackages
+Section: non-free/oldlibs
Priority: extra
Depends: mess, ${misc:Depends}
Architecture: all
@@ -108,7 +108,7 @@ Description: Transitional package for xmess-x
after the installation is complete.
Package: sdlmame-tools
-Section: non-free/metapackages
+Section: non-free/oldlibs
Priority: extra
Depends: mame-tools, ${misc:Depends}
Architecture: amd64 i386
--
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. 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366
The following commit has been merged in the master branch: commit 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366 Author: Emmanuel Kasper emman...@libera.cc Date: Sun May 13 00:57:18 2012 +0200 Changelog update diff --git a/debian/changelog b/debian/changelog index bda6101..cff3b83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ mess (0.145-1) UNRELEASED; urgency=low * New upstream release * Use NetBSD distfiles as temporary source for downloading the source code * Add patch to disable static linking of libflac and libjpeg + * Add BSD 3 clause license text in debian/copyright -- Emmanuel Kasper emman...@libera.cc Thu, 26 Apr 2012 14:34:53 +0200 -- 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. 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366
The following commit has been merged in the master branch: commit 6bfd3b5963722095bceec573c08b4b12538fd95b Author: Emmanuel Kasper emman...@libera.cc Date: Sun May 13 00:56:58 2012 +0200 Reformat as to make lintian happy diff --git a/debian/copyright b/debian/copyright index beec18b..4855ec9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -877,15 +877,15 @@ License: BSD-3-clause modification, are permitted provided that the following conditions are met: . -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. -* Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name 'MAME' nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -- 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. 4a690f8f26fee02ea8ffe1fba4cf5355ca8ea366
The following commit has been merged in the master branch: commit cf3a36098946be20f8500ad7dcddb6e78be1f1a0 Author: Emmanuel Kasper emman...@libera.cc Date: Sun May 13 00:51:31 2012 +0200 typo correction diff --git a/debian/copyright b/debian/copyright index b2b063c..beec18b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -876,7 +876,7 @@ License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright -- 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. 6764e8a07bd9764f2d2c455a44f623d492cddd95
The following commit has been merged in the master branch: commit fed927308b2af63022bdf003bd23374a89346a22 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Apr 26 14:09:36 2012 +0200 Add libjpeg to build-depends diff --git a/debian/control b/debian/control index 5a2685f..bb2fdb8 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (= 8), libexpat1-dev, libgconf2-dev, libgtk2.0-dev, + libjpeg8-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, zlib1g-dev -- 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. 6764e8a07bd9764f2d2c455a44f623d492cddd95
The following commit has been merged in the master branch: commit 6764e8a07bd9764f2d2c455a44f623d492cddd95 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Apr 26 14:35:50 2012 +0200 Disable static linking of libjpeg and libflac diff --git a/debian/changelog b/debian/changelog index b82cac0..bda6101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ mess (0.145-1) UNRELEASED; urgency=low * New upstream release * Use NetBSD distfiles as temporary source for downloading the source code + * Add patch to disable static linking of libflac and libjpeg - -- Emmanuel Kasper emman...@libera.cc Wed, 15 Feb 2012 14:22:52 +0100 + -- Emmanuel Kasper emman...@libera.cc Thu, 26 Apr 2012 14:34:53 +0200 mess (0.144-2) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index bb2fdb8..1559d06 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (= 8), libexpat1-dev, libgconf2-dev, libgtk2.0-dev, + libflac-dev, libjpeg8-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch new file mode 100644 index 000..31c7ed3 --- /dev/null +++ b/debian/patches/build_with_system_flac.patch @@ -0,0 +1,74 @@ +Author: Emmanuel Kasper emman...@libera.cc +Description: Add new makefile switch to allow the use of system flac headers +Forwarded: no + +--- a/makefile b/makefile +@@ -217,6 +217,9 @@ + # uncomment next line to build jpeglib as part of MAME build + BUILD_JPEGLIB = 1 + ++# uncomment next line to build libflac as part of MAME build ++BUILD_FLAC = 1 ++ + # specify symbols level or leave commented to use the default + # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) + # SYMLEVEL = 2 +@@ -414,8 +417,9 @@ + endif + + # need to ensure FLAC functions are statically linked ++ifeq ($(BUILD_FLAC),1) + DEFS += -DFLAC__NO_DLL +- ++endif + + + #- +@@ -640,6 +644,15 @@ + JPEG_LIB = + endif + ++# add flac library ++ifeq ($(BUILD_FLAC),1) ++INCPATH += -I$(SRC)/lib/libflac/include ++FLAC_LIB = $(OBJ)/libflac.a ++else ++LIBS += -lFLAC ++FLAC_LIB = ++endif ++ + #- + # 'default' target needs to go here, before the + # include files which define additional targets +@@ -649,8 +662,6 @@ + + all: default tools + +-FLAC_LIB = $(OBJ)/libflac.a +-# $(OBJ)/libflac++.a + + + #- +--- a/src/emu/sound/samples.c b/src/emu/sound/samples.c +@@ -16,7 +16,7 @@ + #include emu.h + #include emuopts.h + #include samples.h +-#include ../../lib/libflac/include/flac/all.h ++#include FLAC/all.h + + typedef struct _sample_channel sample_channel; + struct _sample_channel +--- a/src/lib/util/chd.c b/src/lib/util/chd.c +@@ -48,7 +48,7 @@ + #include stdlib.h + #include new + +-#include ../../lib/libflac/include/flac/all.h ++#include FLAC/all.h + + + /*** diff --git a/debian/patches/series b/debian/patches/series index c0cac9f..556867f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ gnu_fixes.patch fix_mame_manpage_section.patch build_with_system_libjpeg.patch +build_with_system_flac.patch diff --git a/debian/rules b/debian/rules index 604235c..c3e60cc 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,8 @@ DEB_MAME_OPTS = \ MACOSX_USE_LIBSDL= \ BUILD_EXPAT= \ BUILD_ZLIB= \ - BUILD_JPEGLIB= \ +BUILD_JPEGLIB= \ +BUILD_FLAC= \ SYMBOLS= \ SYMLEVEL= \ DUMPSYM= \ -- 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. e6f74d8531cbd25bb57ae73aec8895bf79dcf9b5
The following commit has been merged in the master branch: commit e6f74d8531cbd25bb57ae73aec8895bf79dcf9b5 Author: Emmanuel Kasper emman...@libera.cc Date: Sun Apr 22 15:42:21 2012 +0200 Switch to NetBSD dist files as source provider as upstream lost it http://forums.bannister.org/ubbthreads.php?ubb=showflatNumber=78156 diff --git a/debian/rules b/debian/rules index 7886f41..604235c 100755 --- a/debian/rules +++ b/debian/rules @@ -172,7 +172,7 @@ VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') MESS_PACKAGE = mess MESS_FILEBASE = $(MESS_PACKAGE)$(VERSION) -MESS_URL = http://mess.redump.net/_media/downloads: +MESS_URL = http://ftp.fr.netbsd.org/pub/NetBSD/packages/distfiles/ AGENT = Debian MAME/MESS Packagers m...@packages.debian.org TMPDIR := $(shell mktemp --dry-run --directory -p .) -- 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. 728e8a9ee96a5e81c8038ad9f8d38286b74b8ba7
The following commit has been merged in the master branch: commit 728e8a9ee96a5e81c8038ad9f8d38286b74b8ba7 Author: Emmanuel Kasper emman...@libera.cc Date: Sun Apr 22 15:52:45 2012 +0200 Switch to NetBSD dist files as source provider as upstream lost its server see http://forums.bannister.org/ubbthreads.php?ubb=showflatNumber=78156page=1 diff --git a/debian/changelog b/debian/changelog index e41ef45..b82cac0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mess (0.145-1) UNRELEASED; urgency=low * New upstream release + * Use NetBSD distfiles as temporary source for downloading the source code -- Emmanuel Kasper emman...@libera.cc Wed, 15 Feb 2012 14:22:52 +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. c01e960d92e96e050d6fcf2edcd1db6454c66191
The following commit has been merged in the master branch: commit c01e960d92e96e050d6fcf2edcd1db6454c66191 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Apr 4 15:00:14 2012 +0200 Remove all parameter from build target as mame tools are built from mess diff --git a/debian/changelog b/debian/changelog index 7bf9c20..006e358 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ mame (0.145-1) UNRELEASED; urgency=low [ Emmanuel Kasper ] - * New upstream release + * New upstream release (closes: #663429) * New patch: makefile switch to link system flac library + * Remove all from build target as we build the tools in mess package [ Cesare Falco ] * Improve backward compatibility in Ubuntu: @@ -16,7 +17,7 @@ mame (0.145-1) UNRELEASED; urgency=low * New patch: makefile switch to link system jpeg library * nplayers packaged is now a supplemental tarball - -- Emmanuel Kasper emman...@libera.cc Mon, 06 Feb 2012 11:19:26 +0100 + -- Emmanuel Kasper emman...@libera.cc Wed, 04 Apr 2012 14:53:19 +0200 mame (0.144-2) UNRELEASED; urgency=low diff --git a/debian/rules b/debian/rules index d73bc62..f12ab1f 100755 --- a/debian/rules +++ b/debian/rules @@ -141,7 +141,7 @@ endif dh $@ override_dh_auto_build: - $(MAKE) -j$(NJOBS) $(DEB_MAME_OPTS) all + $(MAKE) -j$(NJOBS) $(DEB_MAME_OPTS) $(CURDIR)/mame -createconfig mv mame.ini default.mame.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. c01e960d92e96e050d6fcf2edcd1db6454c66191
The following commit has been merged in the master branch: commit 6d0c77edac6cf78e2fbe6e71e64836a51fb40623 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Apr 4 14:01:03 2012 +0200 Remove the mame.preinst and sdlmame.preinst the cases these two fiels deal should have been taken care by previous upgrades diff --git a/debian/mame.preinst b/debian/mame.preinst deleted file mode 100644 index 4c3c1de..000 --- a/debian/mame.preinst +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh - -# preinst script for mame -# (c) Copyright 2012 Debian Games Team -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL-2 or http://www.gnu.org/copyleft/gpl.txt. - -set -e - -# summary of how this script can be called: -#* new-preinst `install' -#* new-preinst `install' old-version -#* new-preinst `upgrade' old-version -#* old-preinst `abort-upgrade' new-version -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -INI=/etc/mame/mame.ini -OLDMD5=7af600a8acb389a87ecff54b5bf53771 faf5639e834d50ef8067bf014aa43d96 - -case $1 in -install) -;; - -upgrade) -# Sweep out wrong directories /usr/share/*/mame-base/ -if dpkg --compare-versions $2 lt 0.138u1; then -rm -rf /usr/share/games/mame-base/ -rm -rf /usr/share/doc/mame-base/ -fi -# Avoid a dpkg prompt if mame.ini is what 0.141-2 generated in postinst -if dpkg --compare-versions $2 le 0.141-2; then -if [ -e -f $INI ]; then -curmd5=$(md5sum $INI | cut -d' ' -f 1) -for md5sum in $OLDMD5; do -if [ $curmd5 = $md5sum ]; then -rm -f $INI -break -fi -done -fi -fi -;; - -abort-upgrade) -;; - -*) -echo preinst called with unknown argument \`$1' 2 -exit 1 -;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/sdlmame.preinst b/debian/sdlmame.preinst deleted file mode 100644 index 5773d12..000 --- a/debian/sdlmame.preinst +++ /dev/null @@ -1,74 +0,0 @@ -#! /bin/sh - -# preinst script for sdlmame -# (c) Copyright 2007 Debian Games Team -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL-2 or http://www.gnu.org/copyleft/gpl.txt. - -set -e - -# summary of how this script can be called: -#* new-preinst `install' -#* new-preinst `install' old-version -#* new-preinst `upgrade' old-version -#* old-preinst `abort-upgrade' new-version -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -# starting with 0.118 .cfg file format is changed heavily -# and the /etc/sdlmame tree has been restructured -# they *must* be deleted on upgrading or they *will* get sdlmame stunned - -# starting with 0.128u7 joystick remapping is switch-driven - -case $1 in -install) -;; - -upgrade) -if dpkg --compare-versions $2 lt 0.118; then -rm -rf /etc/sdlmame/ini -fi -if dpkg --compare-versions $2 lt 0.128u7; then -rm -f /etc/sdlmame/joymap.dat -fi -if dpkg --compare-versions $2 lt 0.130u1; then -rm -rf /var/games/sdlmame -fi -if dpkg --compare-versions $2 lt 0.133; then -if [ -d /usr/local/share/games/sdlmame/crsshair ] -[ ! -e /usr/local/share/games/sdlmame/crosshair ]; then -mv /usr/local/share/games/sdlmame/crsshair \ -/usr/local/share/games/sdlmame/crosshair -fi -fi -if dpkg --compare-versions $2 lt 0.136u1; then -if [ -d /etc/sdlmame ] [ ! -e /etc/mame ]; then -mv /etc/sdlmame /etc/mame -fi -if [ -d /usr/local/share/games/sdlmame ] -[ ! -e /usr/local/share/games/mame ]; then -mv /usr/local/share/games/sdlmame \ -/usr/local/share/games/mame -fi -fi -;; - -abort-upgrade) -;; - -*) -echo preinst called with unknown argument \`$1' 2 -exit 1 -;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] packaging for the mame arcade game emulator branch, master, updated. 65e023179f1a46331399c290a44069983bea306d
The following commit has been merged in the master branch: commit ee930251938befccc8b88a562e943424e97464f2 Author: Emmanuel Kasper emman...@libera.cc Date: Tue Apr 3 11:34:46 2012 +0200 correct name of nplayer tarball for multitarball debian source package diff --git a/debian/rules b/debian/rules index cbfaf25..d73bc62 100755 --- a/debian/rules +++ b/debian/rules @@ -211,7 +211,7 @@ $(MAME_TARBALL): $(MAME_FILEBASE)s.zip NPLAYERS_PACKAGE = nplayers NPLAYERS_URL = http://nplayers.arcadebelgium.be/files/ NPLAYERS_ZIPFILE = $(NPLAYERS_PACKAGE)$(UPSTREAM_VERSION).zip -NPLAYERS_TARBALL = $(MAME_PACKAGE)_$(VERSION)-$(NPLAYERS_PACKAGE).orig.tar.xz +NPLAYERS_TARBALL = $(MAME_PACKAGE)_$(VERSION).orig-$(NPLAYERS_PACKAGE).tar.xz $(NPLAYERS_ZIPFILE): wget -U '$(AGENT)' \ -- 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. 65e023179f1a46331399c290a44069983bea306d
The following commit has been merged in the master branch: commit 65e023179f1a46331399c290a44069983bea306d Author: Emmanuel Kasper emman...@libera.cc Date: Tue Apr 3 11:37:37 2012 +0200 add url where the build_with_system_libjpeg.patch was sent upstream diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch index 71bc950..b7f9b8e 100644 --- a/debian/patches/build_with_system_libjpeg.patch +++ b/debian/patches/build_with_system_libjpeg.patch @@ -1,6 +1,6 @@ Author: Emmanuel Kasper emman...@libera.cc, Cesare Falco cesare.fa...@gmail.com Description: Add new makefile switch to allow the use of jpeg system headers -Forwarded: no +Forwarded: http://forums.bannister.org/ubbthreads.php?ubb=showflatNumber=76614page=3 Index: mame/makefile === -- 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. 65e023179f1a46331399c290a44069983bea306d
The following commit has been merged in the master branch: commit 76280817cf5fa82c833260b6eb30b9c010a0d84b Author: Emmanuel Kasper emman...@libera.cc Date: Tue Apr 3 10:56:25 2012 +0200 Remove useless -O wget option when downloading nplayers file diff --git a/debian/rules b/debian/rules index d45071c..cbfaf25 100755 --- a/debian/rules +++ b/debian/rules @@ -215,8 +215,7 @@ NPLAYERS_TARBALL = $(MAME_PACKAGE)_$(VERSION)-$(NPLAYERS_PACKAGE).orig.tar.xz $(NPLAYERS_ZIPFILE): wget -U '$(AGENT)' \ - $(NPLAYERS_URL)$(NPLAYERS_ZIPFILE) \ - -O $(NPLAYERS_ZIPFILE) + $(NPLAYERS_URL)$(NPLAYERS_ZIPFILE) $(NPLAYERS_TARBALL): $(NPLAYERS_ZIPFILE) mkdir $(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] packaging for the mame arcade game emulator branch, master, updated. 217b36d6abc0f0c03d15e51c091230d8846a1677
The following commit has been merged in the master branch: commit 217b36d6abc0f0c03d15e51c091230d8846a1677 Author: Emmanuel Kasper emman...@libera.cc Date: Tue Apr 3 12:43:48 2012 +0200 since this requirements are satisfied since Ubuntu 8.04 and Debian 6 I guess this file is now useless libexpat1 (= 2.0.1) libsdl1.2debian (= 1.2.13) diff --git a/debian/shlibs.local b/debian/shlibs.local deleted file mode 100644 index e62a269..000 --- a/debian/shlibs.local +++ /dev/null @@ -1,2 +0,0 @@ -libexpat 1 libexpat1 (= 2.0.1) -libSDL-1.2 0 libsdl1.2debian (= 1.2.13) -- 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. ee9f2ce53a62e1554bdacf08bd1cb27552691748
The following commit has been merged in the master branch: commit ee9f2ce53a62e1554bdacf08bd1cb27552691748 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Mar 30 21:48:30 2012 +0200 Update to 0.145 diff --git a/debian/copyright b/debian/copyright index a1b4385..d8a30a6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -155,6 +155,10 @@ Files: src/emu/video/crt9007.h src/emu/machine/upd7201.c src/emu/machine/upd7201.h src/emu/machine/wd17xx.c + src/emu/machine/im6402.c + src/emu/machine/im6402.h + src/emu/machine/pls100.c + src/emu/machine/pls100.h src/emu/sound/lmc1992.c src/emu/sound/lmc1992.h src/emu/video/cdp1861.c @@ -507,9 +511,28 @@ Files: src/osd/osdepend.c src/emu/device.h src/mame/tiny_dev.lst src/mame/mame_dev.lst + src/emu/drivers/testcpu.c + src/emu/machine/laserdsc.c + src/emu/machine/ldpr8210.h + src/emu/machine/ldstub.c + src/emu/machine/ldstub.h + src/emu/machine/ldv1000.h + src/emu/machine/ldvp931.h + src/ldplayer/ldplayer_dev.lst Copyright: Aaron Giles License: BSD-3-clause +Files: src/emu/machine/amigafdc.c + src/lib/formats/hxcmfm_dsk.c + src/lib/formats/ami_dsk.c + src/lib/formats/dfi_dsk.c + src/lib/formats/st_dsk.c + src/lib/formats/flopimg.c + src/lib/formats/mfi_dsk.c + src/lib/formats/ap_dsk35.c +Copyright: Olivier Galibert +License: BSD-3-clause + Files: src/lib/expat/* Copyright: 1998, 1999, 2000 Thai Open Source Software Center Ltd License: -- 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. f847bbb2fa53d0d1b6055522d1a79eef4ad91379
The following commit has been merged in the master branch: commit f847bbb2fa53d0d1b6055522d1a79eef4ad91379 Author: Emmanuel Kasper emman...@libera.cc Date: Sat Mar 31 00:30:02 2012 +0200 Remove deprecated library requirements each debian/ubuntu release has libsdl1.2-dev (= 1.2.11) and libexpat1-dev (= 2.0.1) since at least 4 years diff --git a/debian/control b/debian/control index b135776..4b3ec81 100644 --- a/debian/control +++ b/debian/control @@ -8,12 +8,12 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Ludovic Lechapt ludoma...@gmail.com, Jordi Mallach jo...@debian.org Build-Depends: debhelper (= 8), - libexpat1-dev (= 2.0.1), + libexpat1-dev, libflac-dev, libgconf2-dev, libgtk2.0-dev, libjpeg8-dev, - libsdl1.2-dev (= 1.2.11), + libsdl1.2-dev, libsdl-ttf2.0-dev, zlib1g-dev Standards-Version: 3.9.2 -- 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. 828657ca40fda40a25eba4e08586ac595d054946
The following commit has been merged in the master branch: commit 828657ca40fda40a25eba4e08586ac595d054946 Author: Emmanuel Kasper emman...@libera.cc Date: Sun Mar 4 12:04:33 2012 +0100 Add descriptive headers to build_with_system_* patches diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch index 8273cf1..31c7ed3 100644 --- a/debian/patches/build_with_system_flac.patch +++ b/debian/patches/build_with_system_flac.patch @@ -1,3 +1,7 @@ +Author: Emmanuel Kasper emman...@libera.cc +Description: Add new makefile switch to allow the use of system flac headers +Forwarded: no + --- a/makefile +++ b/makefile @@ -217,6 +217,9 @@ diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch index 923ab0d..71bc950 100644 --- a/debian/patches/build_with_system_libjpeg.patch +++ b/debian/patches/build_with_system_libjpeg.patch @@ -1,3 +1,7 @@ +Author: Emmanuel Kasper emman...@libera.cc, Cesare Falco cesare.fa...@gmail.com +Description: Add new makefile switch to allow the use of jpeg system headers +Forwarded: no + Index: mame/makefile === --- mame.orig/makefile 2012-02-26 22:21:48.0 +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
[SCM] packaging for the mame arcade game emulator branch, master, updated. 20b3d0fa748ccdbdce42d1ccce6f47b2dccfeb09
The following commit has been merged in the master branch: commit dd5624972e1702c0b62a9fa525a20ba6e3acb886 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Mar 1 21:53:52 2012 +0100 First try at patch to allow building with system libflac diff --git a/debian/patches/build_with_system_flac.patch b/debian/patches/build_with_system_flac.patch new file mode 100644 index 000..8273cf1 --- /dev/null +++ b/debian/patches/build_with_system_flac.patch @@ -0,0 +1,70 @@ +--- a/makefile b/makefile +@@ -217,6 +217,9 @@ + # uncomment next line to build jpeglib as part of MAME build + BUILD_JPEGLIB = 1 + ++# uncomment next line to build libflac as part of MAME build ++BUILD_FLAC = 1 ++ + # specify symbols level or leave commented to use the default + # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) + # SYMLEVEL = 2 +@@ -414,8 +417,9 @@ + endif + + # need to ensure FLAC functions are statically linked ++ifeq ($(BUILD_FLAC),1) + DEFS += -DFLAC__NO_DLL +- ++endif + + + #- +@@ -640,6 +644,15 @@ + JPEG_LIB = + endif + ++# add flac library ++ifeq ($(BUILD_FLAC),1) ++INCPATH += -I$(SRC)/lib/libflac/include ++FLAC_LIB = $(OBJ)/libflac.a ++else ++LIBS += -lFLAC ++FLAC_LIB = ++endif ++ + #- + # 'default' target needs to go here, before the + # include files which define additional targets +@@ -649,8 +662,6 @@ + + all: default tools + +-FLAC_LIB = $(OBJ)/libflac.a +-# $(OBJ)/libflac++.a + + + #- +--- a/src/emu/sound/samples.c b/src/emu/sound/samples.c +@@ -16,7 +16,7 @@ + #include emu.h + #include emuopts.h + #include samples.h +-#include ../../lib/libflac/include/flac/all.h ++#include FLAC/all.h + + typedef struct _sample_channel sample_channel; + struct _sample_channel +--- a/src/lib/util/chd.c b/src/lib/util/chd.c +@@ -48,7 +48,7 @@ + #include stdlib.h + #include new + +-#include ../../lib/libflac/include/flac/all.h ++#include FLAC/all.h + + + /*** -- 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. 20b3d0fa748ccdbdce42d1ccce6f47b2dccfeb09
The following commit has been merged in the master branch: commit 20b3d0fa748ccdbdce42d1ccce6f47b2dccfeb09 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Mar 1 21:56:29 2012 +0100 Enable build with build_with_system_flac.patch diff --git a/debian/control b/debian/control index c15ea38..58b4038 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org Build-Depends: debhelper (= 8), libexpat1-dev, + libflac-dev, libgconf2-dev, libgtk2.0-dev, libjpeg8-dev, diff --git a/debian/patches/series b/debian/patches/series index 276ae2d..07a50b7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ nplayers.ini.patch fix_mame_manpage_section.patch gnu_fixes.patch build_with_system_libjpeg.patch +build_with_system_flac.patch diff --git a/debian/rules b/debian/rules index 01adf97..c895fd5 100755 --- a/debian/rules +++ b/debian/rules @@ -38,6 +38,7 @@ DEB_MAME_OPTS = \ BUILD_EXPAT= \ BUILD_ZLIB= \ BUILD_JPEGLIB= \ +BUILD_FLAC= \ SYMBOLS= \ SYMLEVEL= \ DUMPSYM= \ -- 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. 2c98793c3945f4c268bf9b594eb0ad78d4e329bb
The following commit has been merged in the master branch: commit 2c98793c3945f4c268bf9b594eb0ad78d4e329bb Author: Emmanuel Kasper emman...@libera.cc Date: Wed Feb 29 17:40:00 2012 +0100 Disable building of embedded upstream libjpeg diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch new file mode 100644 index 000..923ab0d --- /dev/null +++ b/debian/patches/build_with_system_libjpeg.patch @@ -0,0 +1,57 @@ +Index: mame/makefile +=== +--- mame.orig/makefile 2012-02-26 22:21:48.0 +0100 mame/makefile 2012-02-26 22:22:36.0 +0100 +@@ -214,6 +214,9 @@ + # uncomment next line to include the symbols + # SYMBOLS = 1 + ++# uncomment next line to build jpeglib as part of MAME build ++BUILD_JPEGLIB = 1 ++ + # specify symbols level or leave commented to use the default + # (default is SYMLEVEL = 2 normally; use 1 if you only need backtrace) + # SYMLEVEL = 2 +@@ -628,7 +631,14 @@ + # add formats emulation library + FORMATS_LIB = $(OBJ)/libformats.a + ++# add jpeglib image library ++ifeq ($(BUILD_JPEGLIB),1) ++INCPATH += -I$(SRC)/lib/libjpeg + JPEG_LIB = $(OBJ)/libjpeg.a ++else ++LIBS += -ljpeg ++JPEG_LIB = ++endif + + #- + # 'default' target needs to go here, before the +Index: mame/src/mame/drivers/sliver.c +=== +--- mame.orig/src/mame/drivers/sliver.c2012-02-26 22:21:48.0 +0100 mame/src/mame/drivers/sliver.c 2012-02-26 22:21:53.0 +0100 +@@ -67,7 +67,7 @@ + #include sound/okim6295.h + #include cpu/mcs51/mcs51.h + #include video/ramdac.h +-#include ../../lib/libjpeg/jpeglib.h ++#include jpeglib.h + + + #define FIFO_SIZE 1024 +Index: mame/src/osd/osdcomm.h +=== +--- mame.orig/src/osd/osdcomm.h2012-02-26 22:21:48.0 +0100 mame/src/osd/osdcomm.h 2012-02-26 22:21:53.0 +0100 +@@ -143,6 +143,10 @@ + + #endif + ++/* This should prevent libjpeg of typedef'ing INT32 */ ++#ifndef XMD_H ++#define XMD_H ++#endif + + + /*** diff --git a/debian/patches/series b/debian/patches/series index eb1f11b..c0cac9f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ gnu_fixes.patch fix_mame_manpage_section.patch +build_with_system_libjpeg.patch diff --git a/debian/rules b/debian/rules index df0e790..7886f41 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,7 @@ DEB_MAME_OPTS = \ MACOSX_USE_LIBSDL= \ BUILD_EXPAT= \ BUILD_ZLIB= \ + BUILD_JPEGLIB= \ SYMBOLS= \ SYMLEVEL= \ DUMPSYM= \ @@ -140,7 +141,7 @@ endif dh $@ override_dh_auto_build: - $(MAKE) -j3 $(DEB_MESS_OPTS) all + $(MAKE) -j5 $(DEB_MESS_OPTS) all $(CURDIR)/mess -createconfig mv mess.ini default.mess.ini -- 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. a3d1c1e55914573f847dee2dab9edfa0224d4465
The following commit has been merged in the master branch: commit a3d1c1e55914573f847dee2dab9edfa0224d4465 Author: Emmanuel Kasper emman...@libera.cc Date: Tue Feb 28 15:23:31 2012 +0100 Enable NJOBS hack for parallel builds (make -j xx) Idea taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413050 diff --git a/debian/rules b/debian/rules index 27465f9..01adf97 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,12 @@ CFLAGS = -Wall -g DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +# Number of make jobs = number of cores + 1 +NJOBS:=$(shell echo $$(($$(getconf _NPROCESSORS_ONLN 2/dev/null) + 1))) +ifdef SETNJOBS + NJOBS:=$(SETNJOBS) +endif + # Override relevant make variables in original makefile DEB_MAME_OPTS = \ OPT_FLAGS=-D'INI_PATH=\/etc/mame\' \ @@ -141,7 +147,7 @@ endif dh $@ override_dh_auto_build: - $(MAKE) -j3 $(DEB_MAME_OPTS) all + $(MAKE) -j$(NJOBS) $(DEB_MAME_OPTS) all $(CURDIR)/mame -createconfig mv mame.ini default.mame.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. 4d69aee6c840bdcb09e0882cd6fd709782a99dfe
The following commit has been merged in the master branch: commit 6539cbea103623e3e2699301605ad1b6839a67fa Author: Emmanuel Kasper emman...@libera.cc Date: Thu Feb 23 21:07:35 2012 +0100 Should link properly now with libjpeg Based on hack found at http://cygwin.com/ml/cygwin/2004-07/msg01051.html diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch index 8ef2e02..e5c9f88 100644 --- a/debian/patches/build_with_system_libjpeg.patch +++ b/debian/patches/build_with_system_libjpeg.patch @@ -3,55 +3,32 @@ only works on 64bits system right now Author: Emmanuel Kasper emman...@libera.cc Forwarded: No mame-0.145.orig/makefile -+++ mame-0.145/makefile -@@ -628,7 +628,7 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a +--- a/makefile b/makefile +@@ -628,7 +628,8 @@ # add formats emulation library FORMATS_LIB = $(OBJ)/libformats.a -JPEG_LIB = $(OBJ)/libjpeg.a ++# Link with system jpeg +LIBS += -ljpeg #- # 'default' target needs to go here, before the mame-0.145.orig/src/osd/osdcomm.h -+++ mame-0.145/src/osd/osdcomm.h -@@ -45,6 +45,7 @@ - - #include stdio.h - #include string.h -+#include inttypes.h - //#include stdlib.h - - -@@ -143,7 +144,9 @@ __extension__ typedef signed long long - - #endif - -- -+/* avoid typedef conflicts when building with system libjpeg */ -+#define INT32 int32_t -+#define INT64 int64_t - - /*** - FUNDAMENTAL CONSTANTS mame-0.145.orig/src/mame/drivers/sliver.c -+++ mame-0.145/src/mame/drivers/sliver.c -@@ -62,12 +62,16 @@ Notes: - VSync- 60Hz - */ - -+ - #include emu.h - #include cpu/m68000/m68000.h +--- a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c +@@ -67,7 +67,13 @@ #include sound/okim6295.h #include cpu/mcs51/mcs51.h #include video/ramdac.h -#include ../../lib/libjpeg/jpeglib.h -+#include X11/Xmd.h -+#include jpeglib.h + ++/* This should prevent libjpeg of typedef'ing INT32 */ ++#ifndef XMD_H ++# define XMD_H ++#endif + ++#include jpeglib.h #define FIFO_SIZE 1024 -- 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. 4d69aee6c840bdcb09e0882cd6fd709782a99dfe
The following commit has been merged in the master branch: commit 4d69aee6c840bdcb09e0882cd6fd709782a99dfe Author: Emmanuel Kasper emman...@libera.cc Date: Thu Feb 23 21:34:17 2012 +0100 Update Patch Descripton diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch index e5c9f88..f218dc3 100644 --- a/debian/patches/build_with_system_libjpeg.patch +++ b/debian/patches/build_with_system_libjpeg.patch @@ -1,7 +1,6 @@ -Description: WIP build with system libjpeg -only works on 64bits system right now +Description: build with system libjpeg8 Author: Emmanuel Kasper emman...@libera.cc -Forwarded: No +Forwarded: Yes --- a/makefile +++ b/makefile -- 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. 33d2561fd0d9f603965c69597570b980961a8e33
The following commit has been merged in the master branch: commit 33d2561fd0d9f603965c69597570b980961a8e33 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Feb 24 00:49:28 2012 +0100 Refactoring of the patch diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch index f218dc3..2a2bddc 100644 --- a/debian/patches/build_with_system_libjpeg.patch +++ b/debian/patches/build_with_system_libjpeg.patch @@ -16,18 +16,25 @@ Forwarded: Yes # 'default' target needs to go here, before the --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c -@@ -67,7 +67,13 @@ +@@ -67,7 +67,7 @@ #include sound/okim6295.h #include cpu/mcs51/mcs51.h #include video/ramdac.h -#include ../../lib/libjpeg/jpeglib.h -+ ++#include jpeglib.h + + + #define FIFO_SIZE 1024 +--- a/src/osd/osdcomm.h b/src/osd/osdcomm.h +@@ -143,6 +143,10 @@ + + #endif + +/* This should prevent libjpeg of typedef'ing INT32 */ +#ifndef XMD_H -+# define XMD_H ++#define XMD_H +#endif -+ -+#include jpeglib.h - #define FIFO_SIZE 1024 + /*** -- 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. e7d8cb3389829c6e54580ac3df71601ab286bdcd
The following commit has been merged in the master branch: commit efd49069057b1cd5558b8bec5c6e2ad18e24e28b Author: Emmanuel Kasper emman...@libera.cc Date: Wed Feb 22 13:59:22 2012 +0100 Works at least on 64 bit systems diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch index eb9e3c1..8ef2e02 100644 --- a/debian/patches/build_with_system_libjpeg.patch +++ b/debian/patches/build_with_system_libjpeg.patch @@ -1,8 +1,19 @@ Description: WIP build with system libjpeg -compile but does link properly at the momment +only works on 64bits system right now Author: Emmanuel Kasper emman...@libera.cc -Forwarded: no|not-needed|url proving that it has been forwarded +Forwarded: No +--- mame-0.145.orig/makefile mame-0.145/makefile +@@ -628,7 +628,7 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a + # add formats emulation library + FORMATS_LIB = $(OBJ)/libformats.a + +-JPEG_LIB = $(OBJ)/libjpeg.a ++LIBS += -ljpeg + + #- + # 'default' target needs to go here, before the --- mame-0.145.orig/src/osd/osdcomm.h +++ mame-0.145/src/osd/osdcomm.h @@ -45,6 +45,7 @@ -- 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. e7d8cb3389829c6e54580ac3df71601ab286bdcd
The following commit has been merged in the master branch: commit e7d8cb3389829c6e54580ac3df71601ab286bdcd Author: Emmanuel Kasper emman...@libera.cc Date: Wed Feb 22 14:01:12 2012 +0100 Build with system jpeg instead of mame embededd jpeg diff --git a/debian/control b/debian/control index 17355e8..c15ea38 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (= 8), libexpat1-dev, libgconf2-dev, libgtk2.0-dev, + libjpeg8-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, zlib1g-dev diff --git a/debian/patches/series b/debian/patches/series index 7a660af..276ae2d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ nplayers.ini.patch fix_mame_manpage_section.patch gnu_fixes.patch +build_with_system_libjpeg.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. 7986b88b4fe54a5500bfd4359c9ad74fa3bf93fe
The following commit has been merged in the master branch: commit 7986b88b4fe54a5500bfd4359c9ad74fa3bf93fe Author: Emmanuel Kasper emman...@libera.cc Date: Sat Feb 18 11:31:08 2012 +0100 Begin work on building with system libjpeg compile but does not link yet diff --git a/debian/patches/build_with_system_libjpeg.patch b/debian/patches/build_with_system_libjpeg.patch new file mode 100644 index 000..eb9e3c1 --- /dev/null +++ b/debian/patches/build_with_system_libjpeg.patch @@ -0,0 +1,46 @@ +Description: WIP build with system libjpeg +compile but does link properly at the momment +Author: Emmanuel Kasper emman...@libera.cc +Forwarded: no|not-needed|url proving that it has been forwarded + +--- mame-0.145.orig/src/osd/osdcomm.h mame-0.145/src/osd/osdcomm.h +@@ -45,6 +45,7 @@ + + #include stdio.h + #include string.h ++#include inttypes.h + //#include stdlib.h + + +@@ -143,7 +144,9 @@ __extension__ typedef signed long long + + #endif + +- ++/* avoid typedef conflicts when building with system libjpeg */ ++#define INT32 int32_t ++#define INT64 int64_t + + /*** + FUNDAMENTAL CONSTANTS +--- mame-0.145.orig/src/mame/drivers/sliver.c mame-0.145/src/mame/drivers/sliver.c +@@ -62,12 +62,16 @@ Notes: + VSync- 60Hz + */ + ++ + #include emu.h + #include cpu/m68000/m68000.h + #include sound/okim6295.h + #include cpu/mcs51/mcs51.h + #include video/ramdac.h +-#include ../../lib/libjpeg/jpeglib.h ++#include X11/Xmd.h ++#include jpeglib.h ++ ++ + + + #define FIFO_SIZE 1024 -- 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. b6a1c13d74c759ea736db7613122a7e136384007
The following commit has been merged in the master branch: commit 8a054cb9b4725b94c1a6d27079e4f68a3a2b06ce Author: Emmanuel Kasper emman...@libera.cc Date: Thu Feb 16 12:07:32 2012 +0100 Add erase-upstream target facility diff --git a/debian/rules b/debian/rules index a5731b5..d5ba91e 100755 --- a/debian/rules +++ b/debian/rules @@ -206,3 +206,13 @@ get-orig-source: $(MAME_FILEBASE)s.zip rm -f $(MAME_FILEBASE)s.zip rm -rf $(TMPDIR) + +erase-upstream: + rm -r artwork + rm -r docs + rm -r hash + rm -r hlsl + rm makefile + -rm -r obj + rm -r src + rm whatsnew_0145.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. b6a1c13d74c759ea736db7613122a7e136384007
The following commit has been merged in the master branch: commit b6a1c13d74c759ea736db7613122a7e136384007 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Feb 16 15:48:30 2012 +0100 Add erase-upstream target facility for the package maintainer diff --git a/debian/rules b/debian/rules index d5ba91e..544ec43 100755 --- a/debian/rules +++ b/debian/rules @@ -215,4 +215,4 @@ erase-upstream: rm makefile -rm -r obj rm -r src - rm whatsnew_0145.txt + rm whatsnew_$(UPSTREAM_VERSION).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] mess system emulator branch, master, updated. ddb68f53ed35a1e0db7349799c541adff427e866
The following commit has been merged in the master branch: commit 33f2e9acbc8917fc3992c5fea9de721932a525cf Author: Emmanuel Kasper emman...@libera.cc Date: Wed Feb 15 15:07:46 2012 +0100 Build a mame 0.145 package diff --git a/debian/changelog b/debian/changelog index 9942e46..e41ef45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mess (0.145-1) UNRELEASED; urgency=low + + * New upstream release + + -- Emmanuel Kasper emman...@libera.cc Wed, 15 Feb 2012 14:22:52 +0100 + mess (0.144-2) UNRELEASED; urgency=low [ Emmanuel Kasper ] -- 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. ddb68f53ed35a1e0db7349799c541adff427e866
The following commit has been merged in the master branch: commit ddb68f53ed35a1e0db7349799c541adff427e866 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Feb 15 15:08:27 2012 +0100 Remove dependency on libxinerama-dev as we don't use it directly, sort deps diff --git a/debian/control b/debian/control index 6bcb691..5a2685f 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,10 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org Build-Depends: debhelper (= 8), libexpat1-dev, - libsdl1.2-dev, libgconf2-dev, libgtk2.0-dev, + libsdl1.2-dev, libsdl-ttf2.0-dev, - libxinerama-dev, zlib1g-dev Standards-Version: 3.9.2 Vcs-Git: git://anonscm.debian.org/pkg-games/mess.git -- 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. c08ef4eb170eb3b4d8501369bcd70940ca7e6086
The following commit has been merged in the master branch: commit c08ef4eb170eb3b4d8501369bcd70940ca7e6086 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Feb 15 14:14:54 2012 +0100 Remove dependency on libxinerama-dev as we don't use it directly, sort deps diff --git a/debian/control b/debian/control index f2afe32..17355e8 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,10 @@ Uploaders: Félix Arreola Rodríguez fgatuno@gmail.com, Jordi Mallach jo...@debian.org Build-Depends: debhelper (= 8), libexpat1-dev, - libsdl1.2-dev, libgconf2-dev, libgtk2.0-dev, + libsdl1.2-dev, libsdl-ttf2.0-dev, - libxinerama-dev, zlib1g-dev Standards-Version: 3.9.2 Vcs-Git: git://anonscm.debian.org/pkg-games/mame.git -- 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, upstream, created. a5b960692cd63a66b54bd43af417f90fbdc28c9f
The branch, upstream has been created at a5b960692cd63a66b54bd43af417f90fbdc28c9f (commit) - Shortlog commit a5b960692cd63a66b54bd43af417f90fbdc28c9f Author: Emmanuel Kasper emman...@libera.cc Date: Tue Feb 7 22:01:14 2012 +0100 initial import of 0.145 upstream files commit c6183cc427caeedfa86e40a92702dac8087d2db1 Author: Emmanuel Kasper emman...@libera.cc Date: Tue Feb 7 21:57:00 2012 +0100 unignore upstream stuff --- -- 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. acb97ba770e1d234f256bec68934bfccf16a288f
The following commit has been merged in the master branch: commit acb97ba770e1d234f256bec68934bfccf16a288f Author: Emmanuel Kasper emman...@libera.cc Date: Mon Feb 6 16:18:30 2012 +0100 Build a mame 0.145 package ( not yet policy compliant) diff --git a/debian/changelog b/debian/changelog index cd3500e..64d219f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mame (0.145-1) UNRELEASED; urgency=low + + * New upstream release + + -- Emmanuel Kasper emman...@libera.cc Mon, 06 Feb 2012 11:19:26 +0100 + mame (0.144-2) UNRELEASED; urgency=low [ Emmanuel Kasper ] diff --git a/debian/rules b/debian/rules index 3e6767d..a5731b5 100755 --- a/debian/rules +++ b/debian/rules @@ -152,7 +152,7 @@ override_dh_auto_clean: # 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 whatsnew_$(UPSTREAM_VERSION).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] mess system emulator branch, master, updated. 7c798e0074562e53f2c41b928a6f38d9fa4eb5a6
The following commit has been merged in the master branch: commit 7c798e0074562e53f2c41b928a6f38d9fa4eb5a6 Author: Emmanuel Kasper emman...@libera.cc Date: Thu Jan 26 22:57:35 2012 +0100 Add 64x64 xpm icon for mess diff --git a/debian/changelog b/debian/changelog index 6004887..9942e46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mess (0.144-2) UNRELEASED; urgency=low [ Emmanuel Kasper ] * Yet another batch of syntax errors in DEP5 copyright file corrected + * Add 64x64 xpm icon for mess [ Jordi Mallach ] * Fix Vcs-* URLs. -- 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. 7c798e0074562e53f2c41b928a6f38d9fa4eb5a6
The following commit has been merged in the master branch:
commit 1f8abf582fa0d4705eb1525665b061fe1b5634d0
Author: Emmanuel Kasper emman...@libera.cc
Date: Thu Jan 26 22:46:19 2012 +0100
Install a xpm icon for mess, based on mess logo
diff --git a/debian/install/mame.desktop b/debian/install/mame.desktop
deleted file mode 100644
index 5b37a89..000
--- a/debian/install/mame.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=MAME™ Arcade Emulator
-Name[ca]=Emulador de jocs arcade MAME™
-Name[fr]=Emulateur arcade MAME™
-GenericName=Arcade Emulator
-GenericName[ca]=Emulador de jocs arcade
-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
-Icon=mame
-Terminal=false
-Type=Application
-Categories=Game;Emulator;
diff --git a/debian/install/mame.xpm b/debian/install/mame.xpm
deleted file mode 100644
index 514ed28..000
--- a/debian/install/mame.xpm
+++ /dev/null
@@ -1,161 +0,0 @@
-/* XPM */
-static char * mame_xpm[] = {
-32 32 126 2,
- c None,
-. c #1A85BC,
-+ c #1A7EB8,
-@ c #197CB5,
-# c #1F74B5,
-$ c #1764A5,
-% c #1766A9,
- c #1867AA,
-* c #186CAC,
-= c #1870AE,
-- c #11042C,
-; c #1C024F,
- c #1E0043,
-, c #160139,
-' c #0C0415,
-) c #240155,
-! c #160436,
-~ c #26005C,
-{ c #1A1354,
-] c #0B0438,
-^ c #12051E,
-/ c #03,
-( c #0C133F,
-_ c #1C025A,
-: c #0C0219,
- c #29015F,
-[ c #545180,
-} c #689BB3,
-| c #0A0842,
-1 c #140521,
-2 c #215582,
-3 c #64849B,
-4 c #397393,
-5 c #2D016B,
-6 c #07030B,
-7 c #328AC5,
-8 c #120645,
-9 c #0D040D,
-0 c #46A0CE,
-a c #356E8F,
-b c #2B0166,
-c c #250467,
-d c #36017B,
-e c #525274,
-f c #3680B8,
-g c #57B2E6,
-h c #499FD6,
-i c #3B7A9E,
-j c #2D0173,
-k c #340082,
-l c #390282,
-m c #5BB6E7,
-n c #2175B8,
-o c #47AFE6,
-p c #131543,
-q c #27037A,
-r c #5D528A,
-s c #6ED0FE,
-t c #5FC3F5,
-u c #3A049E,
-v c #5400BA,
-w c #3E0196,
-x c #360190,
-y c #2273B4,
-z c #63D5FE,
-A c #6FCBFC,
-B c #140A53,
-C c #43B2E8,
-D c #4DBAF3,
-E c #60C1F3,
-F c #15144D,
-G c #4F5263,
-H c #4CB4ED,
-I c #5CCBFE,
-J c #68879E,
-K c #4DB5F0,
-L c #5500C3,
-M c #4F526B,
-N c #368EC9,
-O c #3D7CA0,
-P c #0E0624,
-Q c #3C,
-R c #5800D2,
-S c #6B54AF,
-T c #5FD2FE,
-U c #56BFF6,
-V c #57C4FC,
-W c #62BCF1,
-X c #97D9FF,
-Y c #2782CC,
-Z c #5E5293,
-` c #5CC3F9,
- .c #89D2FB,
-..c #5CBCED,
-+.c #92D6FA,
-@.c #2B739F,
-#.c #2987B8,
-$.c #5DBDF1,
-%.c #75DAFE,
-.c #327FAB,
-*.c #42A6DC,
-=.c #1C0454,
--.c #86D4FB,
-;.c #184D70,
-.c #2C7FB1,
-,.c #56C2F5,
-'.c #43A2D5,
-).c #3FA4D7,
-!.c #4D5964,
-~.c #56B9ED,
-{.c #63DAFE,
-].c #7DD0FC,
-^.c #2974A3,
-/.c #23076B,
-(.c #48A5D6,
-_.c #77CFFD,
-:.c #360077,
-.c #2781AF,
-[.c #316F96,
-}.c #4A5A69,
-|.c #250573,
-1.c #06101B,
-2.c #57B7EF,
-3.c #32016F,
-4.c #4CA8DA,
-5.c #175FA3,
-,
-,
-. . . . . . + + + @ @ @ @ @ @ @ # # # # # # # # # # # # ,
-. $ $ % % % % * * * * * * * # # # # # # # # # = ,
-. $ - ; ; ; , ' ' , ) ! ; ~ ) ) ; { ] ) ! - ^ / # = ,
-. % ( _ : : ; ' ' ;~ ) ~ [ } | ) 1 ^ ' / # 2 3 4 ,
-. % ( 5 / 6 ~ - 1 ) 5 ) 5 ) ) [ } 7 8 ) - ^ 9 / 2 3 0 a ,
-. % ( 5 ! / ' ; ~ ! - b c ~ d _ e 0 f g 8 ! 1 ' / 3 0 h i ,
-. % ( j : - ) b k ) b l [ 0 # m m 8 b ! : 3 0 n o i ,
-+ % p k d ) c q j l d j r 0 # o s m 8 5 ) ! 3 0 # o t i ,
-+ p u v w 5 b x u x - [ 0 y o z A m B j ) 3 0 # C D E i ,
-+ F u v u ~ ) u u c - G 0 y H I I s m B b J 0 # K D D E i ,
-+ p u L x , u v j M 0 # H I I I A m F 3 N # D D D H E O ,
-@ ( u L d P , v L r 0 # H z I I I A m } N y D D D D H t O ,
-@ Q u L k b R S 0 # H T T I I I A U 7 # U V D D K H W O ,
-@ Q u R u j w S } y H z z z z X V A t Y V V D D D K H W i ,
-@ * F v R v u Z 0 y H z T z s X D V ` V V V V U .K H H ..i ,
-@ * { v L v Z 0 y H z T T s +.@.#.` ` V V V U +.H H H H $.i ,
-@ * { u j [ 0 y H z z T %.+.2 B .` V V V U +.*.7 o H H ..i ,
-@ * p =.M 0 n H z z z %.-.;.j b .` V ` ,.+.'.p @.*.H H ..i ,
-@ * ( M 0 y H z z z %. .;.8 u 5 .` V t +.).p ] @.*.H H ..i ,
-# * !.f y ~.{.z z -.].;.] x c .` V +.'.p ) ! ^.*.H H ..i ,
-# a 0 y ~.{.z z -.].;./. ~ d ~ .` +.'.p b b , ^.(.H H ..i ,
-4 f y H {.{.z X _.;.q x :.b j ) .+.'.p c c b ! [.(.C H ..i ,
- }.f N W %.%.%.%.A 2 |.u w x d k =..0 ( ] ; ! [.*.m m W O ,
-1.O 7
[SCM] mess system emulator branch, master, updated. e93faa7997936a6416dcd9d27975c085f9991106
The following commit has been merged in the master branch:
commit e93faa7997936a6416dcd9d27975c085f9991106
Author: Emmanuel Kasper emman...@libera.cc
Date: Wed Jan 18 09:35:38 2012 +0100
Make xmame-tools transitional package depends on mame-tools, not on mame
diff --git a/debian/control b/debian/control
index 3b1918c..6bcb691 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Description: Data files for the Multi Emulator Super System
(MESS)
Package: xmame-tools
Section: non-free/metapackages
Priority: extra
-Depends: mame, ${misc:Depends}
+Depends: mame-tools, ${misc:Depends}
Architecture: all
Description: Transitional package for mame-tools
This is a transitional package for mame-tools, and can be safely removed
--
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. dc916357849b9e716871877837211872f99cee7a
The following commit has been merged in the master branch:
commit dc916357849b9e716871877837211872f99cee7a
Author: Emmanuel Kasper emman...@libera.cc
Date: Wed Jan 18 23:03:18 2012 +0100
Add Icon for Mess ( not used in package yet )
diff --git a/debian/install/mess.xpm b/debian/install/mess.xpm
new file mode 100644
index 000..bffca76
--- /dev/null
+++ b/debian/install/mess.xpm
@@ -0,0 +1,659 @@
+/* XPM */
+static char * mess_xpm[] = {
+64 64 592 2,
+ c None,
+. c #FDF2B7,
++ c #E8D293,
+@ c #F6E5AB,
+# c #DCC27D,
+$ c #E6D190,
+% c #A1672F,
+ c #F3E0A4,
+* c #D3B370,
+= c #AE793D,
+- c #E7D292,
+; c #A36C34,
+ c #9B6028,
+, c #D9BC7A,
+' c #9C642B,
+) c #AC773D,
+! c #E7D18F,
+~ c #A36D33,
+{ c #DCBD7C,
+] c #A26F35,
+^ c #E0C284,
+/ c #A36A33,
+( c #D5B676,
+_ c #AA793E,
+: c #E6D192,
+ c #A16D32,
+[ c #DBBE7D,
+} c #FBEDA6,
+| c #A56D35,
+1 c #E4CB8B,
+2 c #A16B2F,
+3 c #E5C887,
+4 c #EAD490,
+5 c #AC773E,
+6 c #E7D08F,
+7 c #A26C32,
+8 c #DCBC7D,
+9 c #FCE3AB,
+0 c #FCE7A9,
+a c #A36E33,
+b c #E9D393,
+c c #A26B32,
+d c #DEC081,
+e c #FCE3A8,
+f c #EAD38E,
+g c #E6D091,
+h c #A16C33,
+i c #DBBE7B,
+j c #FDE2A6,
+k c #FDD8A9,
+l c #FCE6A7,
+m c #ECDA9E,
+n c #A46F35,
+o c #D9B877,
+p c #FDE1A6,
+q c #FDD8A8,
+r c #E9D390,
+s c #E7D08E,
+t c #A26D32,
+u c #DBBE7C,
+v c #FDE1A5,
+w c #FED8A4,
+x c #FED8A5,
+y c #FCE6A6,
+z c #A46D33,
+A c #F0DFA3,
+B c #A67235,
+C c #D3B070,
+D c #FBE3A6,
+E c #AC783D,
+F c #DBBE7A,
+G c #FCE1A2,
+H c #FED6A0,
+I c #FED6A2,
+J c #FDE6A4,
+K c #A46E34,
+L c #F2E5AA,
+M c #A9783C,
+N c #CCA769,
+O c #FDE2A2,
+P c #FED6A3,
+Q c #FFD6A2,
+R c #FED6A1,
+S c #E9D38E,
+T c #E6CF8E,
+U c #DCBD7A,
+V c #FDE09F,
+W c #FED59B,
+X c #FED49E,
+Y c #FED49D,
+Z c #FDE6A3,
+` c #F5E8B0,
+ .c #AF7E40,
+..c #C49E60,
++.c #FBE2A0,
+@.c #FDD59D,
+#.c #FED59D,
+$.c #E9D28D,
+%.c #AC763D,
+.c #E5CF90,
+*.c #A16E34,
+=.c #DCBE7E,
+-.c #FCDD9D,
+;.c #FDD498,
+.c #FED39A,
+,.c #FED49A,
+'.c #FEE5A0,
+).c #A56E34,
+!.c #F8EDB7,
+~.c #B5854A,
+{.c #BD9656,
+].c #FCE29F,
+^.c #FED499,
+/.c #EAD18E,
+(.c #E6CF8D,
+_.c #DCBE7D,
+:.c #FCDE9D,
+.c #FED096,
+[.c #FED196,
+}.c #FFD196,
+|.c #FEE49F,
+1.c #B98D4E,
+2.c #B78D50,
+3.c #FAE19E,
+4.c #FDD396,
+5.c #FED197,
+6.c #FED296,
+7.c #EAD18F,
+8.c #FCF5CB,
+9.c #E4CF8F,
+0.c #A26E33,
+a.c #DDBD7A,
+b.c #FCD282,
+c.c #FCC479,
+d.c #FCC57A,
+e.c #FDC77C,
+f.c #FDC984,
+g.c #FDCD8A,
+h.c #FECF91,
+i.c #FDD092,
+j.c #FDE39D,
+k.c #A56D34,
+l.c #C09659,
+m.c #B48448,
+n.c #F8E09B,
+o.c #FDD192,
+p.c #FED093,
+q.c #FED094,
+r.c #FED092,
+s.c #FED091,
+t.c #FDD08F,
+u.c #EBD18D,
+v.c #AA783C,
+w.c #E5CE8D,
+x.c #DDBE7B,
+y.c #FACA71,
+z.c #FDB450,
+A.c #FCB450,
+B.c #FEB450,
+C.c #FDB554,
+D.c #FEB657,
+E.c #FEBB61,
+F.c #FDDC90,
+G.c #C79F5F,
+H.c #AF7D42,
+I.c #F6DD9A,
+J.c #FDD08E,
+K.c #FDCE8D,
+L.c #FFCE8E,
+M.c #FECE8E,
+N.c #FCBF6B,
+O.c #EBCF88,
+P.c #E4CE8E,
+Q.c #A16D33,
+R.c #DEBE7A,
+S.c #F9C971,
+T.c #FDB24E,
+U.c #FDB34D,
+V.c #FEB24D,
+W.c #FEB34D,
+X.c #FEB34E,
+Y.c #FDB34F,
+Z.c #FCD985,
+`.c #A56C36,
+ +c #F3E0A3,
+.+c #CBAA68,
+++c #AC763C,
+@+c #F2DB96,
+#+c #FECC8A,
+$+c #FECD8A,
+%+c #FDCC8A,
++c #FDCA83,
+*+c #FBBA5E,
+=+c #EAD085,
+-+c #AB773D,
+;+c #E5CD8C,
++c #DEBE79,
+,+c #F9C96B,
+'+c #FDB24D,
+)+c #FDB14C,
+!+c #FDB24A,
+~+c #FCD986,
+{+c #F2DE98,
+]+c #D2B270,
+^+c #A77038,
+/+c #F0D489,
+(+c #FDC779,
+_+c #FEC984,
+:+c #FFCA85,
++c #FECA85,
+[+c #FDC77B,
+}+c #FDB457,
+|+c #FEB14C,
+1+c #EAD084,
+2+c #A46D34,
+3+c #DEBF7B,
+4+c #FAC86D,
+5+c #FDB048,
+6+c #FEB14A,
+7+c #FCD982,
+8+c #CCA86A,
+9+c #A36E35,
+0+c #ECD186,
+a+c #FBBC5D,
+b+c #FDB04B,
+c+c #FDB656,
+d+c #FEC272,
+e+c #FCC982,
+f+c #FDC983,
+g+c #FEC678,
+h+c #FCB454,
+i+c #FEB049,
+j+c #FEB14B,
+k+c #ECCF87,
+l+c #DEBF7A,
+m+c #FAC669,
+n+c #FDAF47,
+o+c #FEAF48,
+p+c #FFAF46,
+q+c #A16931,
+r+c #E8CD82,
+s+c #FBBD5C,
+t+c #FDAF46,
+u+c #FEAE47,
+v+c #FEAF47,
+w+c #FEB85C,
+x+c #FDC371,
+y+c #FEB045,
+z+c #FEAF46,
+A+c #FEB046,
+B+c #E4CD8D,
+C+c #A16C35,
+D+c
[SCM] mess system emulator branch, master, updated. 864175437ef6cdc369a333f17332f47b9161bef0
The following commit has been merged in the master branch: commit 864175437ef6cdc369a333f17332f47b9161bef0 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Jan 11 17:02:19 2012 +0100 correct typo in LICENSE block diff --git a/debian/copyright b/debian/copyright index c7e3d86..aea006a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -613,7 +613,7 @@ License: Files: src/lib/util/md5.* Copyright: public-domain -Licence: +License: This code implements the MD5 message-digest algorithm. The algorithm is due to Ron Rivest. This code was written by Colin Plumb in 1993, no copyright is claimed. -- 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. 6567c3faa2a4ad84b4f80b15e7302a642ab0c6a6
The following commit has been merged in the master branch: commit 6567c3faa2a4ad84b4f80b15e7302a642ab0c6a6 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Jan 11 17:53:38 2012 +0100 Correct old-fsf-address-in-copyright-file diff --git a/debian/copyright b/debian/copyright index aea006a..d2cb68d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -878,8 +878,8 @@ License: LGPL-2.1+ . You should have received a copy of the GNU Lesser General Public License along with the nettle library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file -- 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. 1c3564209de59c0a818da10ad6c0b5c3bd829989
The following commit has been merged in the master branch: commit 1c3564209de59c0a818da10ad6c0b5c3bd829989 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Jan 4 13:23:50 2012 +0100 Correct Lintian Warning about public domain files diff --git a/debian/copyright b/debian/copyright index 723263b..d2b85b8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -563,26 +563,7 @@ License: Files: src/lib/util/md5.* Copyright: public-domain -Licence: public-domain - This code implements the MD5 message-digest algorithm. - The algorithm is due to Ron Rivest. This code was - written by Colin Plumb in 1993, no copyright is claimed. - This code is in the public domain; do with it what you wish. - . - Equivalent code is available from RSA Data Security, Inc. - This code has been tested against that, and is equivalent, - except that you don't need to include two pages of legalese - with every copy. - . - To compute the message digest of a chunk of bytes, declare an - MD5Context structure, pass it to MD5Init, call MD5Update as - needed on buffers full of bytes, and then call MD5Final, which - will fill a supplied 16-byte array with the digest. - . - Changed so as no longer to depend on Colin Plumb's `usual.h' header - definitions; now uses stuff from dpkg's config.h. - - Ian Jackson ijack...@nyx.cs.du.edu. - Still in the public domain. +License: public-domain Files: src/lib/util/sha1.* Copyright: 2001 Peter Gutmann, Andrew Kuchling, Niels Moeller @@ -1039,5 +1020,26 @@ License: LGPL-2.1+ License version 2.1 can be found in the file /usr/share/common-licenses/LGPL-2.1 +License: public-domain + This code implements the MD5 message-digest algorithm. + The algorithm is due to Ron Rivest. This code was + written by Colin Plumb in 1993, no copyright is claimed. + This code is in the public domain; do with it what you wish. + . + Equivalent code is available from RSA Data Security, Inc. + This code has been tested against that, and is equivalent, + except that you don't need to include two pages of legalese + with every copy. + . + To compute the message digest of a chunk of bytes, declare an + MD5Context structure, pass it to MD5Init, call MD5Update as + needed on buffers full of bytes, and then call MD5Final, which + will fill a supplied 16-byte array with the digest. + . + Changed so as no longer to depend on Colin Plumb's `usual.h' header + definitions; now uses stuff from dpkg's config.h. + - Ian Jackson ijack...@nyx.cs.du.edu. + Still in the public domain. + -- 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. d6025fe9b7bec2a767fd07e67ed34c6384abc16c
The following commit has been merged in the master branch: commit d6025fe9b7bec2a767fd07e67ed34c6384abc16c Author: Emmanuel Kasper emman...@libera.cc Date: Mon Jan 2 17:41:09 2012 +0100 Correst FSF address diff --git a/debian/copyright b/debian/copyright index ff2a28e..723263b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1032,8 +1032,8 @@ License: LGPL-2.1+ . You should have received a copy of the GNU Lesser General Public License along with the nettle library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file -- 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. 57b670e7094cb6897f6f3585c5e66261f3e54261
The following commit has been merged in the master branch: commit 57b670e7094cb6897f6f3585c5e66261f3e54261 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 30 17:57:36 2011 +0100 Add SPDX style short name for bsd-3-clause licensed files diff --git a/debian/copyright b/debian/copyright index e39113c..ff2a28e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -509,34 +509,6 @@ Files: src/osd/osdepend.c src/mame/mame_dev.lst Copyright: Aaron Giles License: BSD-3-clause -Copyright Aaron Giles -All rights reserved. - . -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - . -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. -* Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - . -THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. Files: src/lib/expat/* Copyright: 1998, 1999, 2000 Thai Open Source Software Center Ltd @@ -1008,6 +980,10 @@ License: CC-BY-3.0 License; this License is not intended to restrict the license of any rights under applicable law. +License: BSD-3-clause + On Debian systems, the full text of the BSD three clauses license can be found + in the file /usr/share/common-licenses/BSD + License: GPL-2 On Debian systems, the full text of the GNU General Public License version 2 can be found in the file /usr/share/common-licenses/GPL-2. @@ -1063,3 +1039,5 @@ License: LGPL-2.1+ License version 2.1 can be found in 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] mess system emulator branch, master, updated. bee6ce2f00a5d7a7061dc5c20daed6a047f96424
The following commit has been merged in the master branch: commit b847aeb320c13abd0ebf062a45e038fdd2caf4f7 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 30 17:55:45 2011 +0100 Add SPDX style short name for bsd-3-clause licensed files diff --git a/debian/copyright b/debian/copyright index dc6e9ca..c7e3d86 100644 --- a/debian/copyright +++ b/debian/copyright @@ -559,34 +559,6 @@ Files: src/osd/osdepend.c src/mess/mess_dev.lst Copyright: Aaron Giles License: BSD-3-clause -Copyright Aaron Giles -All rights reserved. - . -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - . -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. -* Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - . -THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. Files: src/lib/expat/* Copyright: 1998, 1999, 2000 Thai Open Source Software Center Ltd @@ -854,6 +826,10 @@ License: MAME ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: BSD-3-clause + On Debian systems, the full text of the BSD three clauses license can be found + in the file /usr/share/common-licenses/BSD + License: GPL-2 On Debian systems, the full text of the GNU General Public License version 2 can be found in the file /usr/share/common-licenses/GPL-2. @@ -909,3 +885,5 @@ License: LGPL-2.1+ License version 2.1 can be found in the file /usr/share/common-licenses/LGPL-2.1 + + -- 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. bee6ce2f00a5d7a7061dc5c20daed6a047f96424
The following commit has been merged in the master branch: commit bee6ce2f00a5d7a7061dc5c20daed6a047f96424 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 30 17:59:44 2011 +0100 Yet another batch of syntax errors in DEP5 copyright file corrected diff --git a/debian/changelog b/debian/changelog index 10ff58c..be56ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ mess (0.144-2) UNRELEASED; urgency=low + [ Jordi Mallach ] * Fix Vcs-* URLs - -- Jordi Mallach jo...@debian.org Wed, 21 Dec 2011 00:22:06 +0100 + [ Emmanuel Kasper ] + * Yet another batch of syntax errors in DEP5 copyright file corrected + + -- Emmanuel Kasper emman...@libera.cc Fri, 30 Dec 2011 17:58:39 +0100 mess (0.144-1) unstable; urgency=low -- 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. bee6ce2f00a5d7a7061dc5c20daed6a047f96424
The following commit has been merged in the master branch: commit 202d21d2e64244334066dfe4bdd199b989694169 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 30 17:24:51 2011 +0100 First round of Synthax fix: add standalone license paragraphs for short names, remove comma, put a license for the packaging data diff --git a/debian/copyright b/debian/copyright index 2f76eaa..0b4cd97 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,6 +12,7 @@ Disclaimer: Files: debian/* Copyright: Ludovic Lechapt ludoma...@gmail.com Mamedeb team m...@packages.debian.org +License: GPL-2+ Files: debian/rules Copyright: Cesare Falco cesare.fa...@gmail.com @@ -31,15 +32,15 @@ Files: src/emu/cpu/alph8201/* Copyright: Tatsuyuki Satoh License: MAME -Files: src/emu/cpu/arm7/*, +Files: src/emu/cpu/arm7/* src/emu/cpu/mcs51/* Copyright: Steve Ellenoff License: MAME -Files: src/emu/cpu/cdp1802/*, - src/emu/cpu/lh5801/*, - src/emu/cpu/saturn/*, - src/emu/cpu/sc61860/*, +Files: src/emu/cpu/cdp1802/* + src/emu/cpu/lh5801/* + src/emu/cpu/saturn/* + src/emu/cpu/sc61860/* src/emu/sound/sid.* Copyright: Peter Trauner License: MAME @@ -48,19 +49,19 @@ Files: src/emu/cpu/cp1610/* Copyright: Frank Palazzolo License: MAME -Files: src/emu/cpu/f8/*, - src/emu/cpu/i8085/*, - src/emu/cpu/m6502/*, - src/emu/cpu/sh2/*, - src/emu/cpu/spc700/spc700ds.*, - src/emu/cpu/upd7810/*, - src/emu/cpu/z80/*, - src/emu/cpu/z180/*, +Files: src/emu/cpu/f8/* + src/emu/cpu/i8085/* + src/emu/cpu/m6502/* + src/emu/cpu/sh2/* + src/emu/cpu/spc700/spc700ds.* + src/emu/cpu/upd7810/* + src/emu/cpu/z80/* + src/emu/cpu/z180/* src/emu/cpu/z8000/* Copyright: Juergen Buchmueller License: MAME -Files: src/emu/cpu/g65816/*, +Files: src/emu/cpu/g65816/* src/emu/cpu/m68000/* Copyright: Karl Stenerud License: MAME @@ -77,140 +78,140 @@ Files: src/emu/cpu/i860/* Copyright: Jason Eckhardt License: MAME -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, - 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, - src/mess/machine/c2031.c, - src/mess/machine/c2031.h, - src/mess/machine/comx_clm.h, - src/mess/machine/comx_eb.h, - src/mess/machine/comx_epr.h, - src/mess/machine/comx_fd.h, - src/mess/machine/comx_joy.h, - src/mess/machine/comx_prn.h, - src/mess/machine/comx_ram.h, - src/mess/machine/comx_thm.h, - src/mess/machine/comxexp.c, - src/mess/machine/comxexp.h, - src/mess/machine/ecbbus.c, - src/mess/machine/ecbbus.h, - src/mess/machine/s100.c, - src/mess/machine
[SCM] mess system emulator branch, master, updated. bee6ce2f00a5d7a7061dc5c20daed6a047f96424
The following commit has been merged in the master branch: commit dc4fe878e6d2c99508c34e2764405a093603fc64 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 30 17:40:44 2011 +0100 Second round of comma separated files list truncated diff --git a/debian/copyright b/debian/copyright index 0b4cd97..dc6e9ca 100644 --- a/debian/copyright +++ b/debian/copyright @@ -694,7 +694,7 @@ License: Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -Files: src/emu/video/psx.c, +Files: src/emu/video/psx.c src/emu/video/psx.h Copyright: smf License:MAME @@ -715,16 +715,16 @@ Files: src/mame/audio/snes_snd.c Copyright: Brad Martin License: MAME -Files: src/mame/audio/starwars.c, - src/mame/drivers/starwars.c, +Files: src/mame/audio/starwars.c + src/mame/drivers/starwars.c src/mame/machine/starwars.c Copyright: Steve Baines License: MAME -Files: src/mame/drivers/bfmsys85.c, - src/mame/drivers/bfm_sc1.c, - src/mame/drivers/maygay1b.c, - src/mame/video/awpvid.*, +Files: src/mame/drivers/bfmsys85.c + src/mame/drivers/bfm_sc1.c + src/mame/drivers/maygay1b.c + src/mame/video/awpvid.* src/mame/video/bfm_dm01.c Copyright: J. Wallace and the AGEMAME Development Team License: MAME @@ -755,26 +755,26 @@ Files: src/osd/winui/* Copyright: Michael Soderstrom, Chris Kirmse, MAME32/MAMEUI team License: MAME -Files: src/mess/video/hp48.c, - src/mess/video/thomson.c, - src/mess/formats/thom_cas.h, - src/mess/formats/thom_cas.c, - src/mess/tools/imgtool/modules/thomson.c, - src/mess/includes/thomson.h, - src/mess/includes/hp48.h, - src/mess/drivers/hp48.c, - src/mess/drivers/thomson.c, - src/mess/audio/mea8000.h, - src/mess/audio/mea8000.c, - src/mess/machine/mc6846.h, - src/mess/machine/thomflop.h, - src/mess/machine/thomflop.c, - src/mess/machine/mc6846.c, - src/mess/machine/hp48.c, - src/mess/machine/thomson.c, - src/mess/machine/mc6854.h, - src/mess/machine/mc6843.h, - src/mess/machine/mc6843.c, +Files: src/mess/video/hp48.c + src/mess/video/thomson.c + src/mess/formats/thom_cas.h + src/mess/formats/thom_cas.c + src/mess/tools/imgtool/modules/thomson.c + src/mess/includes/thomson.h + src/mess/includes/hp48.h + src/mess/drivers/hp48.c + src/mess/drivers/thomson.c + src/mess/audio/mea8000.h + src/mess/audio/mea8000.c + src/mess/machine/mc6846.h + src/mess/machine/thomflop.h + src/mess/machine/thomflop.c + src/mess/machine/mc6846.c + src/mess/machine/hp48.c + src/mess/machine/thomson.c + src/mess/machine/mc6854.h + src/mess/machine/mc6843.h + src/mess/machine/mc6843.c src/mess/machine/mc6854.c License: MAME Copyright: Antoine Mine @@ -811,7 +811,7 @@ License: * terms of its usage and license at any time, including retroactively * - This entire notice must remain in the source code. -Files: src/mess/machine/msx.c, +Files: src/mess/machine/msx.c mess/src/mess/machine/msx_slot.c Copyright: Sean Young License: MAME -- 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. b2e798a96b95497317ac55c99563528234c93a19
The following commit has been merged in the master branch: commit b2e798a96b95497317ac55c99563528234c93a19 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Dec 28 13:25:10 2011 +0100 Fix lintian warning: comma-separated-files-in-dep5 diff --git a/debian/copyright b/debian/copyright index 68c7c42..b36b890 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,15 +32,15 @@ Files: src/emu/cpu/alph8201/* Copyright: Tatsuyuki Satoh License: MAME -Files: src/emu/cpu/arm7/*, +Files: src/emu/cpu/arm7/* src/emu/cpu/mcs51/* Copyright: Steve Ellenoff License: MAME -Files: src/emu/cpu/cdp1802/*, - src/emu/cpu/lh5801/*, - src/emu/cpu/saturn/*, - src/emu/cpu/sc61860/*, +Files: src/emu/cpu/cdp1802/* + src/emu/cpu/lh5801/* + src/emu/cpu/saturn/* + src/emu/cpu/sc61860/* src/emu/sound/sid.* Copyright: Peter Trauner License: MAME @@ -49,19 +49,19 @@ Files: src/emu/cpu/cp1610/* Copyright: Frank Palazzolo License: MAME -Files: src/emu/cpu/f8/*, - src/emu/cpu/i8085/*, - src/emu/cpu/m6502/*, - src/emu/cpu/sh2/*, - src/emu/cpu/spc700/spc700ds.*, - src/emu/cpu/upd7810/*, - src/emu/cpu/z80/*, - src/emu/cpu/z180/*, +Files: src/emu/cpu/f8/* + src/emu/cpu/i8085/* + src/emu/cpu/m6502/* + src/emu/cpu/sh2/* + src/emu/cpu/spc700/spc700ds.* + src/emu/cpu/upd7810/* + src/emu/cpu/z80/* + src/emu/cpu/z180/* src/emu/cpu/z8000/* Copyright: Juergen Buchmueller License: MAME -Files: src/emu/cpu/g65816/*, +Files: src/emu/cpu/g65816/* src/emu/cpu/m68000/* Copyright: Karl Stenerud License: MAME @@ -78,100 +78,100 @@ Files: src/emu/cpu/i860/* Copyright: Jason Eckhardt License: MAME -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, - 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, +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
[SCM] packaging for the mame arcade game emulator branch, master, updated. f08057eecd410ac739d39a5cf5c0ccd0458fcae0
The following commit has been merged in the master branch: commit f08057eecd410ac739d39a5cf5c0ccd0458fcae0 Author: Emmanuel Kasper emman...@libera.cc Date: Wed Dec 28 13:33:06 2011 +0100 Yet another batch of syntax errors in DEP5 copyright file corrected diff --git a/debian/changelog b/debian/changelog index a7fd6c9..7f794ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mame (0.144-2) UNRELEASED; urgency=low + + * Yet another batch of syntax errors in DEP5 copyright file corrected + + -- Emmanuel Kasper emman...@libera.cc Wed, 28 Dec 2011 13:27:34 +0100 + mame (0.144-1) unstable; urgency=low [ Jordi Mallach ] -- 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. 5f4c20150c15193bd170c24a6e3e0d5fb5f2dd9e
The following commit has been merged in the master branch: commit 5f4c20150c15193bd170c24a6e3e0d5fb5f2dd9e Author: Emmanuel Kasper emman...@libera.cc Date: Sat Dec 24 14:04:11 2011 +0100 Add License Block for Debian Packaging files diff --git a/debian/copyright b/debian/copyright index 933f866..68c7c42 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,6 +12,7 @@ Disclaimer: Files: debian/* Copyright: Ludovic Lechapt ludoma...@gmail.com Mamedeb team m...@packages.debian.org +License: GPL-2+ 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/cgi-bin/mailman/listinfo/pkg-games-commits
[SCM] packaging for the mame arcade game emulator branch, master, updated. 5f4c20150c15193bd170c24a6e3e0d5fb5f2dd9e
The following commit has been merged in the master branch: commit ef7c14f01f8c346749ac80d942794689fda9c45e Author: Emmanuel Kasper emman...@libera.cc Date: Sat Dec 24 12:48:36 2011 +0100 Update Field name to Format diff --git a/debian/copyright b/debian/copyright index a63d9a9..933f866 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208view=co +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=208view=co Upstream-Name: MAME Source: http://mamedev.org/ 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] mess system emulator branch, master, updated. c593f3bd2de47e1a236b98d48b5531e7555e1446
The following commit has been merged in the master branch: commit 2ba7c6106e2ab99b568e70d6d7c875052296d6f6 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Dec 19 12:09:08 2011 +0100 Remove from copyright entries files removed in mess 0.144 diff --git a/debian/copyright b/debian/copyright index fb97dd8..12aa2dc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -393,7 +393,6 @@ Files: src/osd/osdepend.c, src/emu/profiler.c, src/emu/machine.h, src/emu/clifront.c, - src/emu/devintrf.h, src/emu/cheat.h, src/emu/diexec.c, src/emu/delegate.h, @@ -403,7 +402,6 @@ Files: src/osd/osdepend.c, src/emu/screen.c, src/emu/schedule.c, src/emu/video.c, - src/emu/devintrf.c, src/emu/schedule.h, src/emu/devcpu.c, src/emu/dinvram.h, -- 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. c593f3bd2de47e1a236b98d48b5531e7555e1446
The following commit has been merged in the master branch: commit c593f3bd2de47e1a236b98d48b5531e7555e1446 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Dec 19 13:52:36 2011 +0100 Remove obsolete comment in code diff --git a/debian/rules b/debian/rules index 72524f1..605a14b 100755 --- a/debian/rules +++ b/debian/rules @@ -146,7 +146,6 @@ override_dh_auto_build: override_dh_auto_clean: echo Starting clean process... - # target may fail if the symlinks have not been created $(MAKE) $(DEB_MESS_OPTS) clean [ ! -f default.mess.ini ] || rm default.mess.ini -- 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. c593f3bd2de47e1a236b98d48b5531e7555e1446
The following commit has been merged in the master branch:
commit ea585ed8ab3e4a34a54e3fd0c5f6d8a7f8f0bf92
Author: Emmanuel Kasper emman...@libera.cc
Date: Mon Dec 19 12:10:08 2011 +0100
Update with content from wiki.debian.org/Mess
diff --git a/debian/mess.README.Debian b/debian/mess.README.Debian
index 5016050..7c51c5e 100644
--- a/debian/mess.README.Debian
+++ b/debian/mess.README.Debian
@@ -7,8 +7,8 @@ has been integrated in official mess since 0.136.
1. Create a folder mess and a subfolder mess/roms in your home directory.
-2. For each emulated system, Mess needs a bios/romset to be put in this
directory, plus some software to run ( an exception is the famicom/Nintendo
-Entertainment System where everything happens inside the cartridge )
+2. For each emulated system, Mess needs a bios/romset to be put in this
directory, plus some software to run (an exception is the famicom/Nintendo
+Entertainment System where everything happens inside the cartridge)
3. Check the sanity of your roms. Mess is very picky about that.
@@ -26,9 +26,9 @@ romset osc1000b [tmc1800] is best available
}}}
-4. Get a public domain rom of LJ65, a tetris clone, for your nes
+4. Get a ROM image of LJ65, a Tetris clone for NES distributed as free software
{{{
-wget http://www.pdroms.de/media/upload/files/20091126_lj65_v0.41.zip
+wget http://www.pineight.com/nes/lj65.zip
}}}
{{{
unzip 20091126_lj65_v0.41.zip
@@ -41,7 +41,8 @@ mess nes -cart lj65.nes
6. Basic keyboard commands include
* Tab key to access the mess internal menu
- * 5 to select, 1 to start
+ * 5 to select
+ * 1 to start
7. If mess is way too slow on your computer and you have 3D hardware
acceleration available, change the video parameter from soft to opengl
--
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. 3125d0957fea3423f55f224e9173f830e11187a0
The following commit has been merged in the master branch: commit b4dadbe8ab5315491df5340769305f1eed0bb259 Author: Emmanuel Kasper emman...@libera.cc Date: Sun Dec 18 22:28:31 2011 +0100 Remove files not present anymore in mame 0.144 from the copyright list diff --git a/debian/copyright b/debian/copyright index ca2250a..68d82b7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -369,7 +369,6 @@ Files: src/osd/osdepend.c, src/emu/profiler.c, src/emu/machine.h, src/emu/clifront.c, - src/emu/devintrf.h, src/emu/cheat.h, src/emu/diexec.c, src/emu/delegate.h, @@ -379,7 +378,6 @@ Files: src/osd/osdepend.c, src/emu/screen.c, src/emu/schedule.c, src/emu/video.c, - src/emu/devintrf.c, src/emu/schedule.h, src/emu/devcpu.c, src/emu/dinvram.h, -- 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. 3125d0957fea3423f55f224e9173f830e11187a0
The following commit has been merged in the master branch: commit 78d59497074a98cf8cab511e42a68e1db2e1945e Author: Emmanuel Kasper emman...@libera.cc Date: Sun Dec 18 22:45:11 2011 +0100 Add new entries for files added in mame 0.144 diff --git a/debian/copyright b/debian/copyright index 68d82b7..cafc89d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -501,6 +501,11 @@ Files: src/osd/osdepend.c, src/version.c, src/emu/cothread.c, src/emu/cothread.h, + src/build/makedev.c, + src/emu/device.c, + src/emu/device.h, + src/mame/tiny_dev.lst, + src/mame/mame_dev.lst, Copyright: Aaron Giles License: BSD-3-clause Copyright Aaron Giles -- 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. 3125d0957fea3423f55f224e9173f830e11187a0
The following commit has been merged in the master branch: commit 3125d0957fea3423f55f224e9173f830e11187a0 Author: Emmanuel Kasper emman...@libera.cc Date: Mon Dec 19 12:31:43 2011 +0100 Remove deprecated comment diff --git a/debian/rules b/debian/rules index af82128..d583984 100755 --- a/debian/rules +++ b/debian/rules @@ -147,7 +147,6 @@ override_dh_auto_build: override_dh_auto_clean: echo Starting clean process... $(MAKE) $(DEB_MAME_OPTS) clean - # target may fail if the symlinks have not been created [ ! -f default.mame.ini ] || rm default.mame.ini # 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] mess system emulator branch, master, updated. b0946df391ca9e6a2dd2d849c8bb43c063bea9ac
The following commit has been merged in the master branch:
commit b0946df391ca9e6a2dd2d849c8bb43c063bea9ac
Author: Emmanuel Kasper emman...@libera.cc
Date: Mon Dec 19 15:11:01 2011 +0100
Correct rom name
diff --git a/debian/mess.README.Debian b/debian/mess.README.Debian
index 7c51c5e..63eecba 100644
--- a/debian/mess.README.Debian
+++ b/debian/mess.README.Debian
@@ -31,7 +31,7 @@ romset osc1000b [tmc1800] is best available
wget http://www.pineight.com/nes/lj65.zip
}}}
{{{
-unzip 20091126_lj65_v0.41.zip
+unzip lj65.zip
}}}
5. Now start mess with
--
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. 5f24f389cf467bb5797b5f233097615c7d3fbab0
The following commit has been merged in the master branch: commit 5f24f389cf467bb5797b5f233097615c7d3fbab0 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 9 13:31:16 2011 +0100 Adapt files path for new directory structure ( still based on 0.143 copyright ) diff --git a/debian/copyright b/debian/copyright index d22f335..fb97dd8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -171,30 +171,30 @@ Files: src/emu/video/crt9007.h, 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 + src/mess/machine/c2031.c, + src/mess/machine/c2031.h, + src/mess/machine/comx_clm.h, + src/mess/machine/comx_eb.h, + src/mess/machine/comx_epr.h, + src/mess/machine/comx_fd.h, + src/mess/machine/comx_joy.h, + src/mess/machine/comx_prn.h, + src/mess/machine/comx_ram.h, + src/mess/machine/comx_thm.h, + src/mess/machine/comxexp.c, + src/mess/machine/comxexp.h, + src/mess/machine/ecbbus.c, + src/mess/machine/ecbbus.h, + src/mess/machine/s100.c, + src/mess/machine/s100.h, + src/mess/machine/s100_dj2db.c, + src/mess/machine/s100_dj2db.h, + src/mess/machine/s100_djdma.c, + src/mess/machine/s100_djdma.h, + src/mess/machine/s100_mm65k16s.c, + src/mess/machine/s100_mm65k16s.h, + src/mess/machine/s100_wunderbus.c, + src/mess/machine/s100_wunderbus.h Copyright: The MESS team License: MAME @@ -527,13 +527,13 @@ Files: src/osd/osdepend.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 + src/mess/mess.lst, + src/mess/tiny.lst, + src/osd/osdcomm.h, + src/osd/osdcore.h, + src/osd/osdepend.c, + src/osd/osdepend.h, + src/version.c Copyright: Aaron Giles License: BSD-3-clause Copyright Aaron Giles @@ -680,7 +680,7 @@ Files: src/emu/cpu/pps4/pps4.c Copyright: Miodrag Milanovic License: MAME -Files: /src/mame/machine/megadriv.c +Files: src/mame/machine/megadriv.c Copyright: Grazvydas Ignotas and the MAME Team License: MAME @@ -728,43 +728,39 @@ Files: src/osd/sdl/SDL1211_opengl.h Copyright: Sam Lantinga License: LGPL-2.1 -Files: mess/src/* -Copyright: Nicola Salmoria and the MAME team -License: MAME - -Files: mess/src/osd/winui/* +Files: src/osd/winui/* Copyright: Michael Soderstrom, Chris Kirmse, MAME32/MAMEUI team License: MAME -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 +Files: src/mess/video/hp48.c, + src/mess/video/thomson.c, + src/mess/formats/thom_cas.h, + src/mess/formats/thom_cas.c, + src/mess/tools/imgtool/modules/thomson.c, + src/mess/includes/thomson.h, + src/mess/includes/hp48.h, + src/mess/drivers/hp48.c, + src/mess/drivers/thomson.c, + src/mess/audio/mea8000.h, + src/mess/audio/mea8000.c, + src/mess/machine/mc6846.h, + src/mess/machine/thomflop.h, + src/mess/machine/thomflop.c, + src/mess/machine/mc6846.c, + src/mess/machine/hp48.c, + src/mess/machine/thomson.c, + src/mess/machine/mc6854.h, + src/mess/machine/mc6843.h, + src/mess/machine/mc6843.c, + src/mess/machine/mc6854.c License: MAME Copyright: Antoine Mine -Files: mess/src/osd/windows/mess.rc +Files: src/osd/windows/mess.rc Copyright: Aaron Giles License: BSD-3-clause -Files: mess/src/mess/video/vic6567.c +Files: src/mess/video/vic6567.c Copyright: Christian Bauer License: The rights on the source code remain at the author. @@ -775,7 +771,7 @@ License: You
[SCM] packaging for the mame arcade game emulator branch, master, updated. add7e0462926bc8d99fcc1749e02cd67ab4a7d3e
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
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
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
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
[SCM] packaging for the mame arcade game emulator branch, master, updated. 4004d1e307548bf3f30cc301ff14a4fcf2a5eca2
The following commit has been merged in the master branch:
commit 350569c3f3d1d8d78c7b33a0d02f3f4068aad073
Author: Emmanuel Kasper emman...@libera.cc
Date: Fri Dec 2 20:55:56 2011 +0100
Move transitional packages to section non-free/oldlibs
diff --git a/debian/control b/debian/control
index d490360..6c8c53f 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,8 @@ Description: Multiple Arcade Machine Emulator (MAME)
This package provides the MAME binary and configuration files.
Package: xmame-sdl
+Section: non-free/oldlibs
+Priority: extra
Depends: mame, ${misc:Depends}
Architecture: all
Description: Transitional package for xmame-sdl
@@ -45,6 +47,8 @@ Description: Transitional package for xmame-sdl
after the installation is complete.
Package: xmame-svga
+Section: non-free/oldlibs
+Priority: extra
Depends: mame, ${misc:Depends}
Architecture: i386
Description: Transitional package for xmame-svga
@@ -52,6 +56,8 @@ Description: Transitional package for xmame-svga
after the installation is complete.
Package: xmame-x
+Section: non-free/oldlibs
+Priority: extra
Depends: mame, ${misc:Depends}
Architecture: all
Description: Transitional package for xmame-x
@@ -59,6 +65,8 @@ Description: Transitional package for xmame-x
after the installation is complete.
Package: sdlmame
+Section: non-free/oldlibs
+Priority: extra
Depends: mame, ${misc:Depends}
Architecture: amd64 i386
Description: Transitional package for sdlmame
--
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. 4004d1e307548bf3f30cc301ff14a4fcf2a5eca2
The following commit has been merged in the master branch: commit 4004d1e307548bf3f30cc301ff14a4fcf2a5eca2 Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 2 20:56:39 2011 +0100 Format properly diff --git a/debian/copyright b/debian/copyright index 60b7f56..19fa745 100644 --- a/debian/copyright +++ b/debian/copyright @@ -538,11 +538,11 @@ Copyright: Aaron Giles License: BSD-3-clause Copyright Aaron Giles All rights reserved. -. + . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -. + . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright @@ -552,7 +552,7 @@ License: BSD-3-clause * Neither the name 'MAME' nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -. + . THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -- 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. bd274b66d49cebf837f9b7403c609d280465b20e
The following commit has been merged in the master branch: commit bd274b66d49cebf837f9b7403c609d280465b20e Author: Emmanuel Kasper emman...@libera.cc Date: Fri Dec 2 20:58:48 2011 +0100 Format properly diff --git a/debian/copyright b/debian/copyright index b68e99b..8bf697f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -538,11 +538,11 @@ Copyright: Aaron Giles License: BSD-3-clause Copyright Aaron Giles All rights reserved. -. + . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -. + . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright @@ -552,7 +552,7 @@ License: BSD-3-clause * Neither the name 'MAME' nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -. + . THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -- 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. bd274b66d49cebf837f9b7403c609d280465b20e
The following commit has been merged in the master branch:
commit 2a664d251387c411e168c141ae7c73bcf83bbdb0
Author: Emmanuel Kasper emman...@libera.cc
Date: Fri Dec 2 20:58:04 2011 +0100
move transitional packages to Section: non-free/oldlibs
diff --git a/debian/control b/debian/control
index 4587337..e935db3 100644
--- a/debian/control
+++ b/debian/control
@@ -80,6 +80,8 @@ Description: Data files for the Multi Emulator Super System
(MESS)
This package provides the MESS hash files, keymaps and artwork.
Package: xmame-tools
+Section: non-free/oldlibs
+Priority: extra
Depends: mame, ${misc:Depends}
Architecture: all
Description: Transitional package for mame-tools
@@ -87,6 +89,8 @@ Description: Transitional package for mame-tools
after the installation is complete.
Package: xmess-sdl
+Section: non-free/oldlibs
+Priority: extra
Depends: mess, ${misc:Depends}
Architecture: all
Description: Transitional package for xmess-sdl
@@ -94,6 +98,8 @@ Description: Transitional package for xmess-sdl
after the installation is complete.
Package: xmess-x
+Section: non-free/oldlibs
+Priority: extra
Depends: mess, ${misc:Depends}
Architecture: all
Description: Transitional package for xmess-x
@@ -101,6 +107,8 @@ Description: Transitional package for xmess-x
after the installation is complete.
Package: sdlmame-tools
+Section: non-free/oldlibs
+Priority: extra
Depends: mame-tools, ${misc:Depends}
Architecture: amd64 i386
Description: Transitional package for sdlmame-tools
--
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. f90008753ab4739341dd557c77f1636de7302e15
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
