This is an automated email from the git hooks/post-receive script. jordi pushed a commit to branch master in repository mame.
commit 15d2476a00299890c0c9b316c2028cda3c96baba Author: Jordi Mallach <[email protected]> Date: Tue Apr 12 06:50:11 2016 +0200 New upstream release 0.172. MAME is now GPL-2+. Adjust archive sections and move to main. Build with system Lua5.3 and drop related patches, which aren't needed anymore. --- debian/changelog | 10 ++++++---- debian/control | 4 ++-- debian/patches/lua_pkgconfig.patch | 27 --------------------------- debian/patches/series | 1 - debian/rules | 1 + 5 files changed, 9 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf444af..a10a641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,20 @@ -mame (0.171-1) UNRELEASED; urgency=medium +mame (0.172-1) UNRELEASED; urgency=medium * New upstream release. + - MAME is now licensed under the GPL-2 + * Move to main section. * Update MESS references in mame-tools' description. * Update Build-Depends: - libportaudio-dev → portaudio19-dev - libqt4-dev → qtbase5-dev * Build against system sqlite3. Define USE_SYSTEM_LIB_SQLITE3=1 and add libsqlite3-dev to B-Ds. + * Build against system lua5.3. Define USE_SYSTEM_LIB_LUA passing Debian's + Lua5.3 path to the build system, and add liblua5.3-dev to B-Ds + (lua-zlib and lua-filesystem still unsupported). * Add date_timestamp.patch: remove date of build, which is pointless and makes the binary non-reproducible. * Make the build verbose and remove obsolete define SDL_LIBVER. - * Add lua_pkgconfig.patch: make the build system use Lua 5.2 if requested. - Currently, the build fails if system Lua is used along with system - libsqlite3, though. * Don't try to install web/* data in mame-data, it no longer exists. * Add some extra info to mame-tools' short description. * Use secure URLs for Vcs-* fields, and point to cgit instead of gitweb. diff --git a/debian/control b/debian/control index 918aa43..df41809 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: mame -Section: non-free/games +Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Cesare Falco <[email protected]>, @@ -61,7 +61,7 @@ Description: Multiple Arcade Machine Emulator (MAME) -- data files This package provides MAME hash files, keymaps and artwork. Package: mame-tools -Section: non-free/utils +Section: utils Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/patches/lua_pkgconfig.patch b/debian/patches/lua_pkgconfig.patch deleted file mode 100644 index 628a515..0000000 --- a/debian/patches/lua_pkgconfig.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Jordi Mallach <[email protected]> -Description: Adapt to versioned Lua pkg-config files in Debian - MAME assumes lua's pkg-config modules are named "lua", unversioned. - Hardcode lua5.2 for now. - ---- mame-0.171.orig/3rdparty/lsqlite3/Makefile -+++ mame-0.171/3rdparty/lsqlite3/Makefile -@@ -3,8 +3,8 @@ - ifneq "$(shell pkg-config --version)" "" - # automagic setup (OS X fink, Linux apt-get, ..) - # -- LUAINC= $(shell pkg-config --cflags lua) -- LUALIB= $(shell pkg-config --libs lua) -+ LUAINC= $(shell pkg-config --cflags lua5.2) -+ LUALIB= $(shell pkg-config --libs lua5.2) - LUAEXE= lua - # Now, we actually want to _not_ push in stuff to the distro Lua CMOD directory, - # way better to play within /usr/local/lib/lua/5.1/ -@@ -22,7 +22,7 @@ else - # LUALIB= -L$(BASE)/lib -llua51 - # LUACMOD= $(BASE)/lib/lua/5.1/ - # Windows' LUA_CDIR and LUALIB are both the same as the Lua executable's directory... -- LUALIB= -L$(BASE)/bin -llua51 -+ LUALIB= -L$(BASE)/bin -llua52 - LUACMOD= $(BASE)/bin - # - SQLITE3INC= -I$(BASE)/include diff --git a/debian/patches/series b/debian/patches/series index 76af1b7..18735ac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ date_timestamp.patch -lua_pkgconfig.patch qt5_build.patch diff --git a/debian/rules b/debian/rules index e12669b..1c4426f 100755 --- a/debian/rules +++ b/debian/rules @@ -34,6 +34,7 @@ DEB_OPTS = \ USE_SYSTEM_LIB_ZLIB=1 \ USE_SYSTEM_LIB_JPEG=1 \ USE_SYSTEM_LIB_FLAC=1 \ + USE_SYSTEM_LIB_LUA=lua5.3:/usr/include/lua5.3 \ USE_SYSTEM_LIB_SQLITE3=1 \ USE_SYSTEM_LIB_PORTMIDI=1 \ USE_SYSTEM_LIB_PORTAUDIO=1 \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mame.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
