This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository quakespasm.
commit ccc978862f4106f3dc02206e2bf0cf0f8ae9c89c Author: Simon McVittie <[email protected]> Date: Sun Jun 18 17:31:42 2017 +0100 Use git-format-patch-compatible patch headers as used by gbp pq --- debian/patches/mkpak-bashism.patch | 11 ++++-- debian/patches/reproducible-build.patch | 15 +++++--- debian/patches/spelling-fixes.patch | 49 ++++++++++++++++++-------- debian/patches/use-inherited-build-flags.patch | 6 ++-- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/debian/patches/mkpak-bashism.patch b/debian/patches/mkpak-bashism.patch index 7572ed1..fbb12e8 100644 --- a/debian/patches/mkpak-bashism.patch +++ b/debian/patches/mkpak-bashism.patch @@ -1,6 +1,13 @@ -Description: Use bash for mkpak.sh -Author: Stephen Kitt <[email protected]> +From: Stephen Kitt <[email protected]> +Date: Mon, 23 Mar 2015 23:44:25 +0100 +Subject: Use bash for mkpak.sh +--- + Misc/qs_pak/mkpak.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Misc/qs_pak/mkpak.sh b/Misc/qs_pak/mkpak.sh +index e6562bf..c4de781 100755 --- a/Misc/qs_pak/mkpak.sh +++ b/Misc/qs_pak/mkpak.sh @@ -1,4 +1,4 @@ diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch index 3266a5b..03eb61e 100644 --- a/debian/patches/reproducible-build.patch +++ b/debian/patches/reproducible-build.patch @@ -1,9 +1,16 @@ -Description: Make the build reproducible -Author: Stephen Kitt <[email protected]> +From: Stephen Kitt <[email protected]> +Date: Thu, 30 Apr 2015 17:20:17 +0200 +Subject: Make the build reproducible +--- + Quake/host.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Quake/host.c b/Quake/host.c +index 8481b09..4cc9345 100644 --- a/Quake/host.c +++ b/Quake/host.c -@@ -221,7 +221,6 @@ +@@ -221,7 +221,6 @@ void Host_Version_f (void) { Con_Printf ("Quake Version %1.2f\n", VERSION); Con_Printf ("QuakeSpasm Version %1.2f.%d\n", QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH); @@ -11,7 +18,7 @@ Author: Stephen Kitt <[email protected]> } /* cvar callback functions : */ -@@ -845,7 +844,6 @@ +@@ -845,7 +844,6 @@ void Host_Init (void) NET_Init (); SV_Init (); diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch index 313c297..e84b838 100644 --- a/debian/patches/spelling-fixes.patch +++ b/debian/patches/spelling-fixes.patch @@ -1,9 +1,20 @@ -Description: Spelling fixes -Author: Stephen Kitt <[email protected]> +From: Stephen Kitt <[email protected]> +Date: Fri, 26 Aug 2016 22:44:29 +0200 +Subject: Spelling fixes +--- + Quake/cmd.c | 2 +- + Quake/gl_model.c | 2 +- + Quake/host_cmd.c | 8 ++++---- + Quake/sv_main.c | 2 +- + Quake/zone.c | 18 +++++++++--------- + 5 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/Quake/cmd.c b/Quake/cmd.c +index b14143a..571f7e8 100644 --- a/Quake/cmd.c +++ b/Quake/cmd.c -@@ -334,7 +334,7 @@ +@@ -334,7 +334,7 @@ void Cmd_Alias_f (void) return; } @@ -12,9 +23,11 @@ Author: Stephen Kitt <[email protected]> for (a = cmd_alias ; a ; a=a->next) { if (!strcmp(s, a->name)) +diff --git a/Quake/gl_model.c b/Quake/gl_model.c +index 99d2b95..222cf5f 100644 --- a/Quake/gl_model.c +++ b/Quake/gl_model.c -@@ -580,7 +580,7 @@ +@@ -580,7 +580,7 @@ void Mod_LoadTextures (lump_t *l) if (!tx || tx->name[0] != '+') continue; if (tx->anim_next) @@ -23,9 +36,11 @@ Author: Stephen Kitt <[email protected]> // find the number of frames in the animation memset (anims, 0, sizeof(anims)); +diff --git a/Quake/host_cmd.c b/Quake/host_cmd.c +index b8ff444..0e6a85b 100644 --- a/Quake/host_cmd.c +++ b/Quake/host_cmd.c -@@ -1526,7 +1526,7 @@ +@@ -1526,7 +1526,7 @@ void Host_Kill_f (void) if (sv_player->v.health <= 0) { @@ -34,7 +49,7 @@ Author: Stephen Kitt <[email protected]> return; } -@@ -1595,7 +1595,7 @@ +@@ -1595,7 +1595,7 @@ void Host_PreSpawn_f (void) if (host_client->spawned) { @@ -43,7 +58,7 @@ Author: Stephen Kitt <[email protected]> return; } -@@ -1624,13 +1624,13 @@ +@@ -1624,13 +1624,13 @@ void Host_Spawn_f (void) if (host_client->spawned) { @@ -59,9 +74,11 @@ Author: Stephen Kitt <[email protected]> // if this is the last client to be connected, unpause sv.paused = false; } +diff --git a/Quake/sv_main.c b/Quake/sv_main.c +index 401b43a..95f6fdb 100644 --- a/Quake/sv_main.c +++ b/Quake/sv_main.c -@@ -178,7 +178,7 @@ +@@ -178,7 +178,7 @@ Each entity can have eight independant sound sources, like voice, weapon, feet, etc. Channel 0 is an auto-allocate channel, the others override anything @@ -70,9 +87,11 @@ Author: Stephen Kitt <[email protected]> An attenuation of 0 will play full volume everywhere in the level. Larger attenuations will drop off. (max 4 attenuation) +diff --git a/Quake/zone.c b/Quake/zone.c +index 05936bb..8b12902 100644 --- a/Quake/zone.c +++ b/Quake/zone.c -@@ -289,7 +289,7 @@ +@@ -289,7 +289,7 @@ void Z_Print (memzone_t *zone) #define HUNKNAME_LEN 24 typedef struct { @@ -81,7 +100,7 @@ Author: Stephen Kitt <[email protected]> int size; // including sizeof(hunk_t), -1 = not allocated char name[HUNKNAME_LEN]; } hunk_t; -@@ -307,7 +307,7 @@ +@@ -307,7 +307,7 @@ int hunk_tempmark; ============== Hunk_Check @@ -90,7 +109,7 @@ Author: Stephen Kitt <[email protected]> ============== */ void Hunk_Check (void) -@@ -316,8 +316,8 @@ +@@ -316,8 +316,8 @@ void Hunk_Check (void) for (h = (hunk_t *)hunk_base ; (byte *)h != hunk_base + hunk_low_used ; ) { @@ -101,7 +120,7 @@ Author: Stephen Kitt <[email protected]> if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size) Sys_Error ("Hunk_Check: bad size"); h = (hunk_t *)((byte *)h+h->size); -@@ -373,8 +373,8 @@ +@@ -373,8 +373,8 @@ void Hunk_Print (qboolean all) // // run consistancy checks // @@ -112,7 +131,7 @@ Author: Stephen Kitt <[email protected]> if (h->size < (int) sizeof(hunk_t) || h->size + (byte *)h - hunk_base > hunk_size) Sys_Error ("Hunk_Check: bad size"); -@@ -449,7 +449,7 @@ +@@ -449,7 +449,7 @@ void *Hunk_AllocName (int size, const char *name) memset (h, 0, size); h->size = size; @@ -121,7 +140,7 @@ Author: Stephen Kitt <[email protected]> q_strlcpy (h->name, name, HUNKNAME_LEN); return (void *)(h+1); -@@ -540,7 +540,7 @@ +@@ -540,7 +540,7 @@ void *Hunk_HighAllocName (int size, const char *name) memset (h, 0, size); h->size = size; @@ -130,7 +149,7 @@ Author: Stephen Kitt <[email protected]> q_strlcpy (h->name, name, HUNKNAME_LEN); return (void *)(h+1); -@@ -906,7 +906,7 @@ +@@ -906,7 +906,7 @@ void *Cache_Alloc (cache_user_t *c, int size, const char *name) cache_system_t *cs; if (c->data) diff --git a/debian/patches/use-inherited-build-flags.patch b/debian/patches/use-inherited-build-flags.patch index 711cf5f..37906c2 100644 --- a/debian/patches/use-inherited-build-flags.patch +++ b/debian/patches/use-inherited-build-flags.patch @@ -8,12 +8,14 @@ so remove this behaviour. Origin: vendor, Debian --- - Quake/Makefile | 1 - + Quake/Makefile | 1 - 1 file changed, 1 deletion(-) +diff --git a/Quake/Makefile b/Quake/Makefile +index 862bc7a..0dbec2d 100644 --- a/Quake/Makefile +++ b/Quake/Makefile -@@ -52,7 +52,6 @@ +@@ -52,7 +52,6 @@ STRIP ?= strip #CPUFLAGS= -mtune=k8 #CPUFLAGS= -march=atom CPUFLAGS= -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
