[openarena] 03/07: Re-export patches without patch numbers
Simon McVittie
smcv at debian.org
Sun May 3 20:50:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openarena.
commit e19d7c0f1a76828780ba4f2a8595f8231ae34937
Author: Simon McVittie <smcv at debian.org>
Date: Wed Apr 29 08:58:59 2015 +0100
Re-export patches without patch numbers
In the process, reformat the fix for #681812 into the git-like variation
of DEP-3, which gbp pq can parse.
---
...A_081_COMPATIBLE-define-for-network-comp.patch} | 25 +++++++++-------------
...dd-support-for-the-GNU-Hurd-architecture.patch} | 14 ++++++++----
...-kFreeBSD.patch => Fix-FTBFS-on-kFreeBSD.patch} | 10 +++------
...hing-the-server-by-making-a-callvote-to-.patch} | 18 +++++++++++++---
...irmation-if-a-user-enables-auto-download.patch} | 12 ++++-------
debian/patches/Use-LDFLAGS-on-non-Linux-too.patch | 8 ++-----
...cro-for-the-game-code-version-so-package.patch} | 15 +++++--------
debian/patches/series | 12 +++++------
8 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch b/debian/patches/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
similarity index 95%
rename from debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
rename to debian/patches/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
index 5884d56..6faede8 100644
--- a/debian/patches/0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
+++ b/debian/patches/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
@@ -1,8 +1,6 @@
-From 553bad6773ee1a9b032102d2dfd191b2895be154 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv at debian.org>
Date: Sun, 26 Feb 2012 14:25:51 +0000
-Subject: [PATCH 3/3] Add OPENARENA_081_COMPATIBLE define for network compat
- with 0.8.1
+Subject: Add OPENARENA_081_COMPATIBLE define for network compat with 0.8.1
0.8.1 was approximately compatible with Quake III Arena, whereas 0.8.5
is more like Team Arena. Unfortunately, these are not the same.
@@ -17,15 +15,15 @@ Bug: http://openarena.ws/board/index.php?topic=3717.0
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592965
Forwarded: no
---
- Makefile | 4 ++++
- code/cgame/cg_draw.c | 6 +++---
- code/game/ai_dmq3.c | 2 ++
- code/game/bg_misc.c | 15 ++++++++++++---
- code/game/bg_pmove.c | 2 ++
- code/game/bg_public.h | 11 ++++++++++-
- code/game/g_active.c | 11 ++++++++++-
- code/game/g_combat.c | 4 ++++
- code/game/g_items.c | 9 ++++++++-
+ Makefile | 4 ++++
+ code/cgame/cg_draw.c | 6 +++---
+ code/game/ai_dmq3.c | 2 ++
+ code/game/bg_misc.c | 15 ++++++++++++---
+ code/game/bg_pmove.c | 2 ++
+ code/game/bg_public.h | 11 ++++++++++-
+ code/game/g_active.c | 11 ++++++++++-
+ code/game/g_combat.c | 4 ++++
+ code/game/g_items.c | 9 ++++++++-
9 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
@@ -383,6 +381,3 @@ index c5a546c..3f865c6 100644
upperBound = other->client->ps.stats[STAT_MAX_HEALTH] * 2;
}
---
-1.7.9.1
-
diff --git a/debian/patches/openarena_hurd_support.patch b/debian/patches/Add-support-for-the-GNU-Hurd-architecture.patch
similarity index 55%
rename from debian/patches/openarena_hurd_support.patch
rename to debian/patches/Add-support-for-the-GNU-Hurd-architecture.patch
index 107d087..156e39c 100644
--- a/debian/patches/openarena_hurd_support.patch
+++ b/debian/patches/Add-support-for-the-GNU-Hurd-architecture.patch
@@ -1,12 +1,18 @@
From: Svante Signell <svante.signell at telia.com>
+Date: Thu, 28 Jun 2012 00:10:18 +0200
Subject: Add support for the GNU/Hurd architecture
Origin: vendor, Debian
Bug-Debian: http://bugs.debian.org/679330
+---
+ code/qcommon/q_platform.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
---- openarena-0.8.8/code/qcommon/q_platform.h 2012-06-29 16:56:11.000000000 +0200
-+++ openarena-0.8.8.new/code/qcommon/q_platform.h 2012-06-28 19:21:44.000000000 +0200
-@@ -147,7 +147,7 @@
+diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
+index 15616dd..0ce4c29 100644
+--- a/code/qcommon/q_platform.h
++++ b/code/qcommon/q_platform.h
+@@ -147,7 +147,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//================================================================= LINUX ===
@@ -15,7 +21,7 @@ Bug-Debian: http://bugs.debian.org/679330
#include <endian.h>
-@@ -210,6 +210,8 @@
+@@ -210,6 +210,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define OS_STRING "freebsd"
#elif defined(__OpenBSD__)
#define OS_STRING "openbsd"
diff --git a/debian/patches/0031-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/Fix-FTBFS-on-kFreeBSD.patch
similarity index 76%
rename from debian/patches/0031-Fix-FTBFS-on-kFreeBSD.patch
rename to debian/patches/Fix-FTBFS-on-kFreeBSD.patch
index 23996f5..8d8b749 100644
--- a/debian/patches/0031-Fix-FTBFS-on-kFreeBSD.patch
+++ b/debian/patches/Fix-FTBFS-on-kFreeBSD.patch
@@ -1,7 +1,6 @@
-From 0466115e08b56476310acb8a2f5e4570065b947e Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
Date: Sun, 18 Jul 2010 00:00:40 +0100
-Subject: [PATCH 2/3] Fix FTBFS on kFreeBSD
+Subject: Fix FTBFS on kFreeBSD
[It's close enough to Linux for our purposes that we'll just pretend
it's Linux. -smcv]
@@ -9,8 +8,8 @@ it's Linux. -smcv]
Origin: vendor
Bug-Debian: http://bugs.debian.org/413617
---
- code/qcommon/q_platform.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ code/qcommon/q_platform.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 6490ddb..15616dd 100644
@@ -25,6 +24,3 @@ index 6490ddb..15616dd 100644
#include <endian.h>
---
-1.7.9.1
-
diff --git a/debian/patches/0002-Fix-callvote-kick-player-does-not-exist-crash.patch b/debian/patches/Fix-for-crashing-the-server-by-making-a-callvote-to-.patch
similarity index 61%
rename from debian/patches/0002-Fix-callvote-kick-player-does-not-exist-crash.patch
rename to debian/patches/Fix-for-crashing-the-server-by-making-a-callvote-to-.patch
index 5b862a2..cf45a2d 100644
--- a/debian/patches/0002-Fix-callvote-kick-player-does-not-exist-crash.patch
+++ b/debian/patches/Fix-for-crashing-the-server-by-making-a-callvote-to-.patch
@@ -1,12 +1,24 @@
-Description: Fix for crashing the server by making a callvote to kick a player which does not exist
-Author: Poul Sander <sago007 at gmail.com>
+From: Poul Sander <sago007 at gmail.com>
+Date: Thu, 6 Sep 2012 20:34:53 +0000
+Subject: Fix for crashing the server by making a callvote to kick a player
+ which does not exist
+
+A fix for Debian Bug #681812. Doing "callvote kick PLAYERNAME" for a
+playername that did not exist resultet in undefined behavior.
+
+Depending on architecture this resultet in a crash or something else.
+
Origin: upstream
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681812
Applied-Upstream: http://code.google.com/p/oax/source/detail?r=304
Last-Update: 2012-09-13
Tested-by: Markus Koschany <apo at gambaru.de>
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ code/game/g_cmds.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c
+index 3a14e51..55145bf 100644
--- a/code/game/g_cmds.c
+++ b/code/game/g_cmds.c
@@ -1812,7 +1812,7 @@ void Cmd_CallVote_f( gentity_t *ent ) {
diff --git a/debian/patches/0003-Request-confirmation-if-a-user-enables-auto-download.patch b/debian/patches/Request-confirmation-if-a-user-enables-auto-download.patch
similarity index 92%
rename from debian/patches/0003-Request-confirmation-if-a-user-enables-auto-download.patch
rename to debian/patches/Request-confirmation-if-a-user-enables-auto-download.patch
index 6d2a492..62a4d43 100644
--- a/debian/patches/0003-Request-confirmation-if-a-user-enables-auto-download.patch
+++ b/debian/patches/Request-confirmation-if-a-user-enables-auto-download.patch
@@ -1,7 +1,6 @@
-From b2bc13d7043d8a02df081a54e19a999e82f74f2e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv at debian.org>
Date: Fri, 14 Sep 2012 10:23:06 +0100
-Subject: [PATCH] Request confirmation if a user enables auto-downloading
+Subject: Request confirmation if a user enables auto-downloading
The Q3 UI toolkit isn't great at large amounts of text, so just point
to a deb.li link into the Debian wiki.
@@ -9,9 +8,9 @@ to a deb.li link into the Debian wiki.
Origin: vendor, Debian
Bug-Debian: http://bugs.debian.org/686648
---
- code/q3_ui/ui_firstconnect.c | 17 +++++++++++++++--
- code/q3_ui/ui_local.h | 1 +
- code/q3_ui/ui_preferences.c | 40 +++++++++++++++++++++++++++++++++++++++-
+ code/q3_ui/ui_firstconnect.c | 17 +++++++++++++++--
+ code/q3_ui/ui_local.h | 1 +
+ code/q3_ui/ui_preferences.c | 40 +++++++++++++++++++++++++++++++++++++++-
3 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/code/q3_ui/ui_firstconnect.c b/code/q3_ui/ui_firstconnect.c
@@ -121,6 +120,3 @@ index 32b693f..94d80a0 100644
break;
case ID_DELAGHITSCAN:
---
-1.7.10.4
-
diff --git a/debian/patches/Use-LDFLAGS-on-non-Linux-too.patch b/debian/patches/Use-LDFLAGS-on-non-Linux-too.patch
index 0518282..11cbb10 100644
--- a/debian/patches/Use-LDFLAGS-on-non-Linux-too.patch
+++ b/debian/patches/Use-LDFLAGS-on-non-Linux-too.patch
@@ -1,14 +1,13 @@
-From d05fac99ed9838ecc99426c4d788a66caa82951e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv at debian.org>
Date: Sun, 17 Aug 2014 23:54:09 +0100
-Subject: [PATCH] Use LDFLAGS on non-Linux too
+Subject: Use LDFLAGS on non-Linux too
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 91fb204..617a566 100644
+index 3b2bfdb..9732cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -767,7 +767,7 @@ else # ifeq sunos
@@ -20,6 +19,3 @@ index 91fb204..617a566 100644
endif #Linux
endif #darwin
---
-2.1.0
-
diff --git a/debian/patches/0001-Use-a-cpp-macro-for-the-game-code-version-so-package.patch b/debian/patches/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
similarity index 85%
rename from debian/patches/0001-Use-a-cpp-macro-for-the-game-code-version-so-package.patch
rename to debian/patches/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
index 93efec9..8cb035d 100644
--- a/debian/patches/0001-Use-a-cpp-macro-for-the-game-code-version-so-package.patch
+++ b/debian/patches/Use-a-cpp-macro-for-the-game-code-version-so-package.patch
@@ -1,18 +1,16 @@
-From 85ec08ac63874e3d012743048d1e71ff06044460 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv at debian.org>
Date: Sun, 26 Feb 2012 17:38:46 +0000
-Subject: [PATCH] Use a cpp macro for the game-code version so packages can
- override it
+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.
---
- Makefile | 2 +-
- code/q3_ui/ui_menu.c | 2 +-
- code/qcommon/q_shared.h | 4 ++--
+ Makefile | 2 +-
+ code/q3_ui/ui_menu.c | 2 +-
+ code/qcommon/q_shared.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index b0b6da8..3b2bfdb 100644
+index 91fb204..e9e212f 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ ifeq ($(SDL_CFLAGS),)
@@ -59,6 +57,3 @@ index f8b1365..446add3 100644
#endif
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
---
-1.7.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index a443db9..0241962 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-0001-Use-a-cpp-macro-for-the-game-code-version-so-package.patch
-0002-Fix-callvote-kick-player-does-not-exist-crash.patch
-0003-Request-confirmation-if-a-user-enables-auto-download.patch
-0031-Fix-FTBFS-on-kFreeBSD.patch
-0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
-openarena_hurd_support.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
+Fix-FTBFS-on-kFreeBSD.patch
+Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch
+Add-support-for-the-GNU-Hurd-architecture.patch
Use-LDFLAGS-on-non-Linux-too.patch
Allow-__DATE__-to-be-avoided-for-reproducible-builds.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