[openarena] 01/01: Mark all forwarded patches as having been applied upstream

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openarena.

commit 66db17e2ac97f045b5bbf736184b47156df1b845
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jun 28 11:15:02 2017 +0100

    Mark all forwarded patches as having been applied upstream
---
 debian/changelog                                                    | 6 ++++++
 .../Makefile-confine-LIB-to-the-one-platform-that-needs-it-na.patch | 1 +
 .../Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 1 +
 .../Treat-GNU-kFreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch | 5 ++---
 .../build-canonicalize-all-ARM-variants-to-arm-matching-q_pla.patch | 1 +
 .../build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch | 1 +
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b96c4f..4e9d4c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openarena (0.8.8-20) UNRELEASED; urgency=medium
+
+  * Mark all forwarded patches as having been applied upstream
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 28 Jun 2017 11:14:29 +0100
+
 openarena (0.8.8-19) unstable; urgency=medium
 
   * Redo portability patches based on what went upstream to ioquake3
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 7a8fe48..7c1bb15 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
@@ -10,6 +10,7 @@ architectures.
 (cherry picked from ioquake3 commit 071965b3f0647385f3c32a49c1df5e125550969c)
 
 Forwarded: https://github.com/OpenArena/gamecode/pull/17
+Applied-upstream: https://github.com/OpenArena/gamecode/commit/732d32079b6675f8595471af7d252e190c80f006
 ---
  Makefile | 16 +---------------
  1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
index 27131f8..2d0268d 100644
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
@@ -9,6 +9,7 @@ to fill in the date of the latest source change, typically from a git
 commit or from metadata like the debian/changelog in Debian packages.
 
 Forwarded: https://github.com/OpenArena/gamecode/pull/18
+Applied-upstream: https://github.com/OpenArena/gamecode/commit/3150715fd76beeaf0e9fc54c2d5d5df0a40ebce2
 ---
  Makefile                | 5 +++++
  code/game/g_main.c      | 4 ++--
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 8cfb747..dd8bfe0 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
@@ -15,12 +15,11 @@ https://github.com/ioquake/ioq3/commit/54aa7f25832cfa7a8ac7891a702758ccd88d1ba8
 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
+Applied-upstream: https://github.com/OpenArena/gamecode/commit/dbdae40bb755d9897e5e1e9e3b22ce351588b044.
+Applied-upstream: https://github.com/OpenArena/gamecode/commit/732d32079b6675f8595471af7d252e190c80f006
 ---
  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 a579d2d..6158435 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
@@ -22,6 +22,7 @@ As a result, it is unaffected by this change.
 (cherry picked from ioquake3 commit c91fab3900345d047f085d1e467521bba1ebd28f)
 
 Forwarded: https://github.com/OpenArena/gamecode/pull/17
+Applied-upstream: https://github.com/OpenArena/gamecode/commit/732d32079b6675f8595471af7d252e190c80f006
 ---
  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 f9888e9..24c897f 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
@@ -34,6 +34,7 @@ COMPILE_PLATFORM.
 (cherry-picked from ioquake3 commit 2a71948f21fe588dbce9b29409283e9c912ef8e7)
 
 Forwarded: https://github.com/OpenArena/gamecode/pull/17
+Applied-upstream: https://github.com/OpenArena/gamecode/commit/732d32079b6675f8595471af7d252e190c80f006
 ---
  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