diff -Nru openarena-088-data-0.8.8/debian/changelog openarena-088-data-0.8.8/debian/changelog --- openarena-088-data-0.8.8/debian/changelog 2017-10-30 11:04:27.000000000 +0000 +++ openarena-088-data-0.8.8/debian/changelog 2018-04-30 08:56:20.000000000 +0000 @@ -1,3 +1,16 @@ +openarena-088-data (0.8.8-9) unstable; urgency=medium + + * Declare compliance with Debian Policy v4.1.4 + * d/README.source: Document non-DEP-14 Debian packaging repository + layout + * Update Vcs-* for move to salsa.debian.org + * Remove empty d/watch + * d/copyright: Sort Files: * paragraph to the top to placate Lintian + * d/copyright: Consolidate GPL-2 license grants into one standalone license + paragraph + + -- Simon McVittie Mon, 30 Apr 2018 09:56:20 +0100 + openarena-088-data (0.8.8-8) unstable; urgency=medium * Merge from openarena-data/0.8.5split-10: diff -Nru openarena-088-data-0.8.8/debian/control openarena-088-data-0.8.8/debian/control --- openarena-088-data-0.8.8/debian/control 2017-10-30 11:04:27.000000000 +0000 +++ openarena-088-data-0.8.8/debian/control 2018-04-30 08:56:20.000000000 +0000 @@ -12,10 +12,10 @@ zip, zlib1g-dev, Rules-Requires-Root: no -Standards-Version: 4.1.1 +Standards-Version: 4.1.4 Homepage: http://www.openarena.ws/ -Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b openarena-088-data -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-088-data +Vcs-Git: https://salsa.debian.org/games-team/openarena-data.git -b openarena-088-data +Vcs-Browser: https://salsa.debian.org/games-team/openarena-data/tree/openarena-088-data Package: openarena-088-data Architecture: all diff -Nru openarena-088-data-0.8.8/debian/copyright openarena-088-data-0.8.8/debian/copyright --- openarena-088-data-0.8.8/debian/copyright 2017-10-30 11:04:27.000000000 +0000 +++ openarena-088-data-0.8.8/debian/copyright 2018-04-30 08:56:20.000000000 +0000 @@ -13,31 +13,6 @@ source files added (where the files from the PK3 are not themselves the preferred form for modification). See README.source for full details. -License: GPL-2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - . - You can find the GPL license text on a Debian system under - /usr/share/common-licenses/GPL-2. - -License: short-GPL-2 - "released under the gpl v2 license (read COPYING)" - . - You can find the GPL license text on a Debian system under - /usr/share/common-licenses/GPL-2. - -License: even-shorter-GPL-2 - "License: GPLv2" - . - You can find the GPL license text on a Debian system under - /usr/share/common-licenses/GPL-2. - Files: * Copyright: © 2005-2012 OpenArena Team (see CREDITS, CREDITS-0.8.5, CREDITS-0.8.8) @@ -66,11 +41,11 @@ Files: */models/players/merman source/assets/models/merman Copyright: © 2007 Enki -License: short-GPL-2 +License: GPL-2 Files: source/assets/maps/oa_thor.* pak6-patch088/maps/oa_thor.* Copyright: © "Thor" (no year specified) -License: even-shorter-GPL-2 +License: GPL-2 Files: debian/* Copyright: @@ -87,3 +62,25 @@ Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided this notice is preserved. This file is offered as-is, without any warranty. + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + You can find the GPL license text on a Debian system under + /usr/share/common-licenses/GPL-2. + +License: GPL-2 + Some files are licensed under the GPL version 2 and no other version: + . + merman: "released under the gpl v2 license (read COPYING)" + oa_thor: "License: GPLv2" + . + You can find the GPL license text on a Debian system under + /usr/share/common-licenses/GPL-2. diff -Nru openarena-088-data-0.8.8/debian/README.source openarena-088-data-0.8.8/debian/README.source --- openarena-088-data-0.8.8/debian/README.source 2017-10-30 11:04:27.000000000 +0000 +++ openarena-088-data-0.8.8/debian/README.source 2018-04-30 08:56:20.000000000 +0000 @@ -58,8 +58,8 @@ modified openarena engine detects the magic number 'NTVE' and loads a native-code equivalent of the original QVM file. -Source code/build system (or lack of) -------------------------------------- +Upstream source code/build system (or lack of) +---------------------------------------------- Upstream do not have an official source code release or build system for the assets. For some files (scripts, most sounds and some textures), the data in @@ -78,8 +78,32 @@ but that's not relevant to obtaining sources), and revision 947 corresponds to 0.8.8. +Debian packaging git repository +------------------------------- + +This git repository deliberately does not follow the DEP-14 repository +layout recommendation, because it contains multiple Debian source packages. +Instead, packaging branches are named for the source package in question: + + openarena-085-data + openarena-088-data + openarena-data + openarena-maps + openarena-misc + openarena-oacmp1 + openarena-players + openarena-players-mature + openarena-textures + +and tags include the package name between "debian/" and the version: + + debian/openarena-data/0.8.5split-11 (etc.) + +Changes that affect all source packages are made on the openarena-data +branch and merged to all other branches. + Assets from the PK3 files, and the source files for them, are not included in -the pkg-games git repository due to their size; please obtain them from the +the games team git repository due to their size; please obtain them from the orig tarball, or as described below, before building. How the orig.tar.* is constructed diff -Nru openarena-088-data-0.8.8/debian/watch openarena-088-data-0.8.8/debian/watch --- openarena-088-data-0.8.8/debian/watch 2017-10-30 11:04:27.000000000 +0000 +++ openarena-088-data-0.8.8/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Upstream releases are available from http://www.openarena.ws/download.php -# but that page isn't really susceptible to uscan, so this watch file -# does nothing.