[quakespasm] 03/03: New upstream release
Stephen Kitt
skitt at moszumanska.debian.org
Thu Nov 23 17:09:25 UTC 2017
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository quakespasm.
commit 62cc8b7be7adec882ea40980f440f686de7bfc84
Author: Stephen Kitt <steve at sk2.org>
Date: Thu Nov 23 17:58:00 2017 +0100
New upstream release
---
debian/changelog | 8 +++-
debian/copyright | 72 +++++++++++++++++++++++++++++++--
debian/patches/reproducible-build.patch | 8 ++--
debian/patches/spelling-fixes.patch | 42 +++++++------------
4 files changed, 93 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fb80353..d6b2552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+quakespasm (0.93.0+dfsg-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Stephen Kitt <skitt at debian.org> Thu, 23 Nov 2017 17:46:32 +0100
+
quakespasm (0.92.1+dfsg-3) unstable; urgency=medium
* d/copyright: Use https Format URL
@@ -152,7 +158,7 @@ quakespasm (0.85.6-1) unstable; urgency=low
upstream-provided patch in Misc/homedir_0.patch.
* Add the VCS URLs.
* Add myself to uploaders.
-
+
[ Simon McVittie ]
* debian/patches/gnu.patch: add "gnu" as an OS type, so compilation can at
least be attempted on Hurd and kFreeBSD
diff --git a/debian/copyright b/debian/copyright
index 4c6b886..95d88e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Files: *
Copyright: 1996-2005 Id Software, Inc.
2002-2009 John Fitzgibbons and others
2007-2008 Kistian Duske
- 2007-2013 O. Sezer
+ 2007-2016 O. Sezer
2010-2014 QuakeSpasm developers
License: GPL-2+
@@ -16,9 +16,13 @@ Copyright: 2014 Sander van Dijk
License: ISC
Files: Quake/filenames.h
-Copyright: 2000, 2001, 2007 Free Software Foundation, Inc.
+Copyright: 2000-2016 Free Software Foundation, Inc.
License: GPL-2+
+Files: Quake/lodepng.*
+Copyright: 2005-2017 Lode Vandevenne
+License: zlib
+
Files: Quake/q_ctype.h
Copyright: 1998 Red Hat Software, Inc.
License: GPL-2+
@@ -48,14 +52,19 @@ Comment:
Parts of this file are based on the decoder tutorial program madlld
under the BSD-3-clause license.
+Files: Quake/stb_image_write.h
+Copyright: 2017 Sean Barrett
+License: MIT or unlicense
+
Files: Quake/strlcat.c
Quake/strlcpy.c
Copyright: 1998 Todd C. Miller
License: ISC
Files: debian/*
-Copyright: 2011 David Banks
- 2015-2016 Stephen Kitt
+Copyright: 2011-2013 David Banks
+ 2011-2013, 2016-2017 Simon McVittie
+ 2012, 2015-2017 Stephen Kitt
License: GPL-2+
License: GPL-2+
@@ -112,3 +121,58 @@ License: BSD-3-clause
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: unlicense
+ This is free and unencumbered software released into the public domain.
+ Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+ software, either in source code form or as a compiled binary, for any purpose,
+ commercial or non-commercial, and by any means.
+ In jurisdictions that recognize copyright laws, the author or authors of this
+ software dedicate any and all copyright interest in the software to the public
+ domain. We make this dedication for the benefit of the public at large and to
+ the detriment of our heirs and successors. We intend this dedication to be an
+ overt act of relinquishment in perpetuity of all present and future rights to
+ this software under copyright law.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 03eb61e..147c4ec 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -6,19 +6,17 @@ 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 @@ void Host_Version_f (void)
+@@ -232,7 +232,6 @@
{
Con_Printf ("Quake Version %1.2f\n", VERSION);
- Con_Printf ("QuakeSpasm Version %1.2f.%d\n", QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH);
+ Con_Printf ("QuakeSpasm Version " QUAKESPASM_VER_STRING "\n");
- Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
}
/* cvar callback functions : */
-@@ -845,7 +844,6 @@ void Host_Init (void)
+@@ -857,7 +856,6 @@
NET_Init ();
SV_Init ();
diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch
index 652b638..335c6f3 100644
--- a/debian/patches/spelling-fixes.patch
+++ b/debian/patches/spelling-fixes.patch
@@ -11,11 +11,9 @@ Subject: Spelling fixes
Quake/zone.c | 18 +++++++++---------
6 files changed, 18 insertions(+), 18 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 @@ void Cmd_Alias_f (void)
+@@ -334,7 +334,7 @@
return;
}
@@ -24,11 +22,9 @@ index b14143a..571f7e8 100644
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 @@ void Mod_LoadTextures (lump_t *l)
+@@ -605,7 +605,7 @@
if (!tx || tx->name[0] != '+')
continue;
if (tx->anim_next)
@@ -37,11 +33,9 @@ index 99d2b95..222cf5f 100644
// 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 @@ void Host_Kill_f (void)
+@@ -1531,7 +1531,7 @@
if (sv_player->v.health <= 0)
{
@@ -50,7 +44,7 @@ index b8ff444..0e6a85b 100644
return;
}
-@@ -1595,7 +1595,7 @@ void Host_PreSpawn_f (void)
+@@ -1600,7 +1600,7 @@
if (host_client->spawned)
{
@@ -59,7 +53,7 @@ index b8ff444..0e6a85b 100644
return;
}
-@@ -1624,13 +1624,13 @@ void Host_Spawn_f (void)
+@@ -1629,13 +1629,13 @@
if (host_client->spawned)
{
@@ -75,11 +69,9 @@ index b8ff444..0e6a85b 100644
// if this is the last client to be connected, unpause
sv.paused = false;
}
-diff --git a/Quake/net_dgrm.c b/Quake/net_dgrm.c
-index 15885cf..12a3c93 100644
--- a/Quake/net_dgrm.c
+++ b/Quake/net_dgrm.c
-@@ -555,7 +555,7 @@ static void Test_Poll (void *unused)
+@@ -554,7 +554,7 @@
break;
if (MSG_ReadByte() != CCREP_PLAYER_INFO)
@@ -88,7 +80,7 @@ index 15885cf..12a3c93 100644
MSG_ReadByte(); /* playerNumber */
Q_strcpy(name, MSG_ReadString());
-@@ -707,7 +707,7 @@ Reschedule:
+@@ -706,7 +706,7 @@
return;
Error:
@@ -97,11 +89,9 @@ index 15885cf..12a3c93 100644
Done:
dfunc.Close_Socket(test2Socket);
test2InProgress = 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 @@ Each entity can have eight independant sound sources, like voice,
+@@ -178,7 +178,7 @@
weapon, feet, etc.
Channel 0 is an auto-allocate channel, the others override anything
@@ -110,11 +100,9 @@ index 401b43a..95f6fdb 100644
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 @@ void Z_Print (memzone_t *zone)
+@@ -289,7 +289,7 @@
#define HUNKNAME_LEN 24
typedef struct
{
@@ -123,7 +111,7 @@ index 05936bb..8b12902 100644
int size; // including sizeof(hunk_t), -1 = not allocated
char name[HUNKNAME_LEN];
} hunk_t;
-@@ -307,7 +307,7 @@ int hunk_tempmark;
+@@ -307,7 +307,7 @@
==============
Hunk_Check
@@ -132,7 +120,7 @@ index 05936bb..8b12902 100644
==============
*/
void Hunk_Check (void)
-@@ -316,8 +316,8 @@ void Hunk_Check (void)
+@@ -316,8 +316,8 @@
for (h = (hunk_t *)hunk_base ; (byte *)h != hunk_base + hunk_low_used ; )
{
@@ -143,7 +131,7 @@ index 05936bb..8b12902 100644
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 @@ void Hunk_Print (qboolean all)
+@@ -373,8 +373,8 @@
//
// run consistancy checks
//
@@ -154,7 +142,7 @@ index 05936bb..8b12902 100644
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 @@ void *Hunk_AllocName (int size, const char *name)
+@@ -449,7 +449,7 @@
memset (h, 0, size);
h->size = size;
@@ -163,7 +151,7 @@ index 05936bb..8b12902 100644
q_strlcpy (h->name, name, HUNKNAME_LEN);
return (void *)(h+1);
-@@ -540,7 +540,7 @@ void *Hunk_HighAllocName (int size, const char *name)
+@@ -540,7 +540,7 @@
memset (h, 0, size);
h->size = size;
@@ -172,7 +160,7 @@ index 05936bb..8b12902 100644
q_strlcpy (h->name, name, HUNKNAME_LEN);
return (void *)(h+1);
-@@ -906,7 +906,7 @@ void *Cache_Alloc (cache_user_t *c, int size, const char *name)
+@@ -906,7 +906,7 @@
cache_system_t *cs;
if (c->data)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quakespasm.git
More information about the Pkg-games-commits
mailing list