[openarena] 05/13: Re-order patch series
Simon McVittie
smcv at debian.org
Sun Jun 25 01:10:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openarena.
commit e4b506079e7a3e83d133e3aa8b06795a50b1daa8
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jun 25 00:47:09 2017 +0100
Re-order patch series
* Re-order patch series: backports from upstream, then forwarded patches,
and finally Debian-specific (non-upstreamable) patches
* Move Debian-specific patches into debian/patches/debian/
---
debian/changelog | 3 +++
...ck-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 8 ++++----
.../Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch | 6 +++---
.../Request-confirmation-if-a-user-enables-auto-download.patch | 0
.../Use-a-cpp-macro-for-the-game-code-version-so-package.patch | 9 ++++++---
debian/patches/series | 8 ++++----
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3197eff..18e8031 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ openarena (0.8.8-19) UNRELEASED; urgency=medium
- d/p/Use-LDFLAGS-on-non-Linux-too.patch:
Drop patch, no longer needed for any GNU platform. GNU/kFreeBSD
and GNU/Hurd both take the GNU/Linux code paths now.
+ * Re-order patch series: backports from upstream, then forwarded patches,
+ and finally Debian-specific (non-upstreamable) patches
+ * Move Debian-specific patches into debian/patches/debian/
-- Simon McVittie <smcv at debian.org> Sat, 24 Jun 2017 19:18:46 +0100
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 1b97bc1..27131f8 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
@@ -16,7 +16,7 @@ Forwarded: https://github.com/OpenArena/gamecode/pull/18
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index fece468..c9ebbfc 100644
+index 6eeba4f..4f9a310 100644
--- a/Makefile
+++ b/Makefile
@@ -840,6 +840,11 @@ else
@@ -30,7 +30,7 @@ index fece468..c9ebbfc 100644
+
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
- ifeq ($(OPENARENA_081_COMPATIBLE),1)
+ ifeq ($(V),1)
diff --git a/code/game/g_main.c b/code/game/g_main.c
index 48baac7..426973e 100644
--- a/code/game/g_main.c
@@ -54,11 +54,11 @@ index 48baac7..426973e 100644
srand( randomSeed );
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
-index 446add3..ded56bb 100644
+index f8b1365..56e2ab8 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -42,6 +42,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- #define PRODUCT_VERSION "OAX"
+ #define PRODUCT_VERSION "1.35"
#endif
+#ifndef PRODUCT_DATE
diff --git a/debian/patches/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch b/debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
similarity index 99%
rename from debian/patches/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
rename to debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
index 5708652..81f0c4f 100644
--- a/debian/patches/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
+++ b/debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
@@ -13,7 +13,7 @@ copy of the source.
Origin: vendor, Debian
Bug: http://openarena.ws/board/index.php?topic=3717.0
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592965
-Forwarded: no
+Forwarded: not-needed, Debian-specific
---
Makefile | 4 ++++
code/cgame/cg_draw.c | 6 +++---
@@ -27,10 +27,10 @@ Forwarded: no
9 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
-index cec64e7..8a4f04a 100644
+index febefca..3b21833 100644
--- a/Makefile
+++ b/Makefile
-@@ -842,6 +842,10 @@ endif
+@@ -847,6 +847,10 @@ endif
BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
diff --git a/debian/patches/Request-confirmation-if-a-user-enables-auto-download.patch b/debian/patches/debian/Request-confirmation-if-a-user-enables-auto-download.patch
similarity index 100%
rename from debian/patches/Request-confirmation-if-a-user-enables-auto-download.patch
rename to debian/patches/debian/Request-confirmation-if-a-user-enables-auto-download.patch
diff --git a/debian/patches/Use-a-cpp-macro-for-the-game-code-version-so-package.patch b/debian/patches/debian/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
similarity index 92%
rename from debian/patches/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
rename to debian/patches/debian/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
index aee735a..82b6ac2 100644
--- a/debian/patches/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
+++ b/debian/patches/debian/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
@@ -3,6 +3,9 @@ Date: Sun, 26 Feb 2012 17:38:46 +0000
Subject: Use a cpp macro for the game-code version so packages can override it
Also draw it at a variable location, so it's right-aligned.
+
+Origin: vendor, Debian
+Forwarded: not-needed, Debian-specific
---
Makefile | 2 +-
code/q3_ui/ui_menu.c | 2 +-
@@ -10,7 +13,7 @@ Also draw it at a variable location, so it's right-aligned.
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 6eeba4f..cec64e7 100644
+index 4f9a310..febefca 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ ifeq ($(SDL_CFLAGS),)
@@ -36,7 +39,7 @@ index c407a45..0a5ba8f 100644
UI_DrawString( 0, 480-14, va("^7Protocol: %i",(int)trap_Cvar_VariableValue("protocol")), UI_SMALLFONT, color);
}
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
-index f8b1365..446add3 100644
+index 56e2ab8..ded56bb 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -56,4 +59,4 @@ index f8b1365..446add3 100644
+ #define PRODUCT_VERSION "OAX"
#endif
- #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
+ #ifndef PRODUCT_DATE
diff --git a/debian/patches/series b/debian/patches/series
index 4af2f03..eee0bba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
+Fix-for-crashing-the-server-by-making-a-callvote-to-.patch
Treat-GNU-kFreeBSD-and-GNU-Hurd-as-equivalent-to-GNU-Linu.patch
Makefile-confine-LIB-to-the-one-platform-that-needs-it-na.patch
build-canonicalize-all-ARM-variants-to-arm-matching-q_pla.patch
build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch
-Use-a-cpp-macro-for-the-game-code-version-so-package.patch
-Fix-for-crashing-the-server-by-making-a-callvote-to-.patch
-Request-confirmation-if-a-user-enables-auto-download.patch
-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+debian/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
+debian/Request-confirmation-if-a-user-enables-auto-download.patch
+debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena.git
More information about the Pkg-games-commits
mailing list