This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openarena.
commit 062ea55303e2372c539dd0361f391f1ee1732867 Author: Simon McVittie <[email protected]> Date: Sun Jun 25 00:37:01 2017 +0100 Mark build system patches as forwarded --- ...nfine-LIB-to-the-one-platform-that-needs-it-na.patch | 2 ++ ...FreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch | 17 +++++++++++------ ...icalize-all-ARM-variants-to-arm-matching-q_pla.patch | 2 ++ ...e-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/patches/Makefile-confine-LIB-to-the-one-platform-that-needs-it-na.patch b/debian/patches/Makefile-confine-LIB-to-the-one-platform-that-needs-it-na.patch index 76d3e1a..7a8fe48 100644 --- a/debian/patches/Makefile-confine-LIB-to-the-one-platform-that-needs-it-na.patch +++ b/debian/patches/Makefile-confine-LIB-to-the-one-platform-that-needs-it-na.patch @@ -8,6 +8,8 @@ path means we don't need to maintain an exhaustive list of 64-bit architectures. (cherry picked from ioquake3 commit 071965b3f0647385f3c32a49c1df5e125550969c) + +Forwarded: https://github.com/OpenArena/gamecode/pull/17 --- Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/debian/patches/Treat-GNU-kFreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch b/debian/patches/Treat-GNU-kFreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch index 3d10797..8cfb747 100644 --- a/debian/patches/Treat-GNU-kFreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch +++ b/debian/patches/Treat-GNU-kFreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch @@ -7,15 +7,20 @@ which is the layer that this engine interacts with directly. The specific kernel used is below the level that this engine is dealing with. This is a combination of ioquake3 commits -fd4cf3b7839ec36789627c27758478cca8f69ffe, -58a8f5ef8bca62ea6bc4a4e0cfff65b5d28d36a0, -d2f8b9f4bb3fda901ffd6f18074d035469832338, -54aa7f25832cfa7a8ac7891a702758ccd88d1ba8 (partial) and -540e4225cceacaf843a9d4741bfbb11ba19fdd7a, variously written by -Cyril Brulebois, Thilo Schulz, devhc and Svante Signell. +https://github.com/ioquake/ioq3/commit/fd4cf3b7839ec36789627c27758478cca8f69ffe, +https://github.com/ioquake/ioq3/commit/58a8f5ef8bca62ea6bc4a4e0cfff65b5d28d36a0, +https://github.com/ioquake/ioq3/commit/d2f8b9f4bb3fda901ffd6f18074d035469832338, +https://github.com/ioquake/ioq3/commit/54aa7f25832cfa7a8ac7891a702758ccd88d1ba8 +(partial) and +https://github.com/ioquake/ioq3/commit/540e4225cceacaf843a9d4741bfbb11ba19fdd7a, +variously written by Cyril Brulebois, Thilo Schulz, devhc and Svante Signell. + +Makefile parts applied upstream in OpenArena/gamecode commit +https://github.com/OpenArena/gamecode/commit/dbdae40bb755d9897e5e1e9e3b22ce351588b044. Bug-Debian: https://bugs.debian.org/413617 Bug-Debian: https://bugs.debian.org/679330 +Forwarded: https://github.com/OpenArena/gamecode/pull/17 --- Makefile | 4 ++-- code/qcommon/q_platform.h | 9 ++++++++- diff --git a/debian/patches/build-canonicalize-all-ARM-variants-to-arm-matching-q_pla.patch b/debian/patches/build-canonicalize-all-ARM-variants-to-arm-matching-q_pla.patch index c954b49..a579d2d 100644 --- a/debian/patches/build-canonicalize-all-ARM-variants-to-arm-matching-q_pla.patch +++ b/debian/patches/build-canonicalize-all-ARM-variants-to-arm-matching-q_pla.patch @@ -20,6 +20,8 @@ uname -m produces a string not starting with arm (specifically As a result, it is unaffected by this change. (cherry picked from ioquake3 commit c91fab3900345d047f085d1e467521bba1ebd28f) + +Forwarded: https://github.com/OpenArena/gamecode/pull/17 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch b/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch index d62436c..f9888e9 100644 --- a/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch +++ b/debian/patches/build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch @@ -32,6 +32,8 @@ When cross-compiling, the tools are compiled for the build architecture COMPILE_PLATFORM. (cherry-picked from ioquake3 commit 2a71948f21fe588dbce9b29409283e9c912ef8e7) + +Forwarded: https://github.com/OpenArena/gamecode/pull/17 --- Makefile | 6 +++++- code/qcommon/q_platform.h | 30 ++---------------------------- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
