diff -Nru openarena-0.8.8+dfsg/debian/changelog openarena-0.8.8+dfsg/debian/changelog --- openarena-0.8.8+dfsg/debian/changelog 2020-07-24 11:48:28.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/changelog 2020-12-22 14:15:39.000000000 +0000 @@ -1,3 +1,16 @@ +openarena (0.8.8+dfsg-5) unstable; urgency=medium + + * Mark patch for #966150 as forwarded upstream + * d/gbp.conf: Set packaging branch to debian/latest + * Standards-Version: 4.5.1 (no changes required) + * Add overrides for some Lintian false-positives (#973759, #971707) + * Add patches to fix some typos + * Silence Lintian tags for the "allready" console command. + Lintian reasonably interprets this as a typo for "already", but it + actually means "all ready". + + -- Simon McVittie Tue, 22 Dec 2020 14:15:39 +0000 + openarena (0.8.8+dfsg-4) unstable; urgency=medium * d/p/build-Link-game-cgame-ui-modules-to-LIBS.patch: diff -Nru openarena-0.8.8+dfsg/debian/control openarena-0.8.8+dfsg/debian/control --- openarena-0.8.8+dfsg/debian/control 2020-07-24 11:48:28.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/control 2020-12-22 14:15:39.000000000 +0000 @@ -10,7 +10,7 @@ debhelper-compat (= 12), dpkg-dev (>= 1.16.1), ioquake3-server (>= 1.36+u20150730+dfsg1-1~), -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/games-team/openarena.git Vcs-Browser: https://salsa.debian.org/games-team/openarena Homepage: https://openarena.ws/ diff -Nru openarena-0.8.8+dfsg/debian/gbp.conf openarena-0.8.8+dfsg/debian/gbp.conf --- openarena-0.8.8+dfsg/debian/gbp.conf 2020-07-24 11:48:28.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/gbp.conf 2020-12-22 14:15:39.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/master +debian-branch = debian/latest upstream-branch = upstream/latest pristine-tar = True patch-numbers = False diff -Nru openarena-0.8.8+dfsg/debian/openarena.lintian-overrides openarena-0.8.8+dfsg/debian/openarena.lintian-overrides --- openarena-0.8.8+dfsg/debian/openarena.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/openarena.lintian-overrides 2020-12-22 14:15:39.000000000 +0000 @@ -0,0 +1,10 @@ +# /usr/lib is the conventional place to put a non-FHS tree that uses +# symlinks to pull in architecture-independent files from /usr/share (#971707) +breakout-link usr/lib/openarena/*/*.pk3 -> usr/share/games/openarena/*/*.pk3 + +# #973759 +debian-changelog-file-is-a-symlink usr/share/doc/openarena/changelog.gz + +# Admin console command indicating "all [players are] ready", not a typo +# for "already" +spelling-error-in-binary usr/lib/openarena/* allready already diff -Nru openarena-0.8.8+dfsg/debian/openarena-server.lintian-overrides openarena-0.8.8+dfsg/debian/openarena-server.lintian-overrides --- openarena-0.8.8+dfsg/debian/openarena-server.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/openarena-server.lintian-overrides 2020-12-22 14:15:39.000000000 +0000 @@ -0,0 +1,13 @@ +# /usr/lib is the conventional place to put a non-FHS tree that uses +# symlinks to pull in architecture-independent files from /usr/share +# or configuration from /etc (#971707) +breakout-link usr/lib/openarena-server/* -> etc/openarena-server/* +breakout-link usr/lib/openarena-server/*/*.pk3 -> usr/share/games/openarena/*/*.pk3 +breakout-link usr/lib/openarena-server/*/etc/openarena-server -> etc/openarena-server + +# #973759 +debian-changelog-file-is-a-symlink usr/share/doc/openarena-server/changelog.gz +# +# Admin console command indicating "all [players are] ready", not a typo +# for "already" +spelling-error-in-binary usr/lib/openarena-server/* allready already diff -Nru openarena-0.8.8+dfsg/debian/patches/build-Link-game-cgame-ui-modules-to-LIBS.patch openarena-0.8.8+dfsg/debian/patches/build-Link-game-cgame-ui-modules-to-LIBS.patch --- openarena-0.8.8+dfsg/debian/patches/build-Link-game-cgame-ui-modules-to-LIBS.patch 2020-07-24 11:48:28.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/patches/build-Link-game-cgame-ui-modules-to-LIBS.patch 2020-12-22 14:15:39.000000000 +0000 @@ -20,11 +20,9 @@ to link them explicitly to their dependencies, as is done here. $(LIBS) also includes -ldl, which is unnecessary but harmless. -[This version was adapted from ioquake3 to openarena.] - Bug-Debian: https://bugs.debian.org/966150 Bug-Debian: https://bugs.debian.org/966173 -Forwarded: https://github.com/ioquake/ioq3/pull/461 +Forwarded: https://github.com/OpenArena/gamecode/pull/138 --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -Nru openarena-0.8.8+dfsg/debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch openarena-0.8.8+dfsg/debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch --- openarena-0.8.8+dfsg/debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch 2020-07-24 11:48:28.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/patches/debian/Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch 2020-12-22 14:15:39.000000000 +0000 @@ -307,7 +307,7 @@ ent->client->ps.powerups[PW_INVULNERABILITY] = level.time; } diff --git a/code/game/g_combat.c b/code/game/g_combat.c -index 8c61944..692269b 100644 +index 5bc1004..289ebc0 100644 --- a/code/game/g_combat.c +++ b/code/game/g_combat.c @@ -238,7 +238,9 @@ void TossClientPersistantPowerups( gentity_t *ent ) { diff -Nru openarena-0.8.8+dfsg/debian/patches/Fix-a-typo-for-already.patch openarena-0.8.8+dfsg/debian/patches/Fix-a-typo-for-already.patch --- openarena-0.8.8+dfsg/debian/patches/Fix-a-typo-for-already.patch 1970-01-01 00:00:00.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/patches/Fix-a-typo-for-already.patch 2020-12-22 14:15:39.000000000 +0000 @@ -0,0 +1,22 @@ +From: Simon McVittie +Date: Tue, 22 Dec 2020 12:53:55 +0000 +Subject: Fix a typo for 'already' + +Forwarded: https://github.com/OpenArena/gamecode/pull/139 +--- + code/game/g_combat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/code/game/g_combat.c b/code/game/g_combat.c +index 8c61944..5bc1004 100644 +--- a/code/game/g_combat.c ++++ b/code/game/g_combat.c +@@ -1030,7 +1030,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, + return; + } + +- // the intermission has allready been qualified for, so don't ++ // the intermission has already been qualified for, so don't + // allow any extra scoring + if ( level.intermissionQueued ) { + return; diff -Nru openarena-0.8.8+dfsg/debian/patches/Fix-typo-of-empty-in-ai_main.c.patch openarena-0.8.8+dfsg/debian/patches/Fix-typo-of-empty-in-ai_main.c.patch --- openarena-0.8.8+dfsg/debian/patches/Fix-typo-of-empty-in-ai_main.c.patch 1970-01-01 00:00:00.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/patches/Fix-typo-of-empty-in-ai_main.c.patch 2020-12-22 14:15:39.000000000 +0000 @@ -0,0 +1,23 @@ +From: Zack Middleton +Date: Mon, 27 Jun 2016 21:13:27 -0500 +Subject: Fix typo of empty in ai_main.c + +Origin: ioquake3, commit:274fa898b1cbadd444a2641c93c0f7daadba9af6 +Applied-upstream: commit:7215f4bd3f0822e36f29fb907b55c0ea385f5100 +--- + code/game/ai_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/code/game/ai_main.c b/code/game/ai_main.c +index 1ee21b8..a8e2493 100644 +--- a/code/game/ai_main.c ++++ b/code/game/ai_main.c +@@ -256,7 +256,7 @@ void BotTestAAS(vec3_t origin) { + if (bot_testsolid.integer) { + if (!trap_AAS_Initialized()) return; + areanum = BotPointAreaNum(origin); +- if (areanum) BotAI_Print(PRT_MESSAGE, "\remtpy area"); ++ if (areanum) BotAI_Print(PRT_MESSAGE, "\rempty area"); + else BotAI_Print(PRT_MESSAGE, "\r^1SOLID area"); + } + else if (bot_testclusters.integer) { diff -Nru openarena-0.8.8+dfsg/debian/patches/series openarena-0.8.8+dfsg/debian/patches/series --- openarena-0.8.8+dfsg/debian/patches/series 2020-07-24 11:48:28.000000000 +0000 +++ openarena-0.8.8+dfsg/debian/patches/series 2020-12-22 14:15:39.000000000 +0000 @@ -5,6 +5,8 @@ build-define-ARCH_STRING-in-Makefile-on-Linux-and-other-G.patch Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch build-Link-game-cgame-ui-modules-to-LIBS.patch +Fix-typo-of-empty-in-ai_main.c.patch +Fix-a-typo-for-already.patch Disable-Altivec-instructions-on-PowerPC-unless-requested.patch debian/Use-a-cpp-macro-for-the-game-code-version-so-package.patch debian/Request-confirmation-if-a-user-enables-auto-download.patch