This is an automated email from the git hooks/post-receive script. cesarefalco-guest pushed a commit to branch master in repository mame.
commit 84c2df1eb7303001ce293aa923838f7c47a9cbc9 Author: Cesare Falco <[email protected]> Date: Sun Jun 4 08:51:38 2017 +0200 Refresh patches. --- debian/patches/avoid_linenoise.patch | 8 ++++---- debian/patches/sphinx_mathjax_location.patch | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/avoid_linenoise.patch b/debian/patches/avoid_linenoise.patch index 5149007..5e97041 100644 --- a/debian/patches/avoid_linenoise.patch +++ b/debian/patches/avoid_linenoise.patch @@ -44,7 +44,7 @@ Index: mame/scripts/src/3rdparty.lua -if (_OPTIONS["osd"] ~= "uwp") then +if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then includedirs { - MAME_DIR .. "3rdparty/linenoise-ng/include", + MAME_DIR .. "3rdparty/linenoise", } @@ -595,7 +595,7 @@ end MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", @@ -57,11 +57,11 @@ Index: mame/scripts/src/3rdparty.lua } @@ -1633,7 +1633,7 @@ end -------------------------------------------------- - -- linenoise-ng library + -- linenoise library -------------------------------------------------- -if (_OPTIONS["osd"] ~= "uwp") then +if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then - project "linenoise-ng" + project "linenoise" uuid "7320ffc8-2748-4add-8864-ae29b72a8511" kind (LIBTYPE) Index: mame/scripts/src/main.lua @@ -75,5 +75,5 @@ Index: mame/scripts/src/main.lua -if (_OPTIONS["osd"] ~= "uwp") then +if (_OPTIONS["osd"] ~= "uwp") and (not _OPTIONS["NO_USE_LINENOISE"]) then links { - "linenoise-ng", + "linenoise", } diff --git a/debian/patches/sphinx_mathjax_location.patch b/debian/patches/sphinx_mathjax_location.patch index cd444d1..913190a 100644 --- a/debian/patches/sphinx_mathjax_location.patch +++ b/debian/patches/sphinx_mathjax_location.patch @@ -4,12 +4,12 @@ Description: Use the packaged version of MathJax. libjs-mathjax in the generated sphinx docs. Forwarded: no -Index: mame-0.178/docs/source/conf.py +Index: mame/docs/source/conf.py =================================================================== ---- mame-0.178.orig/docs/source/conf.py -+++ mame-0.178/docs/source/conf.py -@@ -38,7 +38,7 @@ edit_on_github_project = 'mamedev/docs' - edit_on_github_branch = 'master/source' +--- mame.orig/docs/source/conf.py ++++ mame/docs/source/conf.py +@@ -38,7 +38,7 @@ edit_on_github_project = 'mamedev/mame' + edit_on_github_branch = 'master/docs/source' # Math -mathjax_path = "http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"; -- 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
