diff -Nru openarena-players-0.8.5split/debian/changelog openarena-players-0.8.5split/debian/changelog --- openarena-players-0.8.5split/debian/changelog 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/changelog 2017-10-30 11:08:11.000000000 +0000 @@ -1,3 +1,21 @@ +openarena-players (0.8.5split-10) unstable; urgency=medium + + * Merge from openarena-data/0.8.5split-10: + * Use https URL for the Format of d/copyright + * Declare compliance with Debian Policy v4.1.1 + * Move to debhelper compat level 10 + * Remove pre-generated QVM files from source package, so that building + the package proves they can be regenerated + * d/qvmbrute.c: Include timing information + * Remove unused lintian overrides + * Set Rules-Requires-Root to no + * Remove all upstream files from packaging git repository + * Normalize mtime of vm directory in PK3 archive to SOURCE_DATE_EPOCH + for reproducible builds of openarena-data, openarena-085-data, + openarena-088-data + + -- Simon McVittie Mon, 30 Oct 2017 11:08:11 +0000 + openarena-players (0.8.5split-8) unstable; urgency=medium * Merge from openarena-data (0.8.5split-8): diff -Nru openarena-players-0.8.5split/debian/compat openarena-players-0.8.5split/debian/compat --- openarena-players-0.8.5split/debian/compat 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/compat 2017-10-30 11:08:11.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru openarena-players-0.8.5split/debian/control openarena-players-0.8.5split/debian/control --- openarena-players-0.8.5split/debian/control 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/control 2017-10-30 11:08:11.000000000 +0000 @@ -6,12 +6,13 @@ Bruno "Fuddl" Kleinert , Simon McVittie , Build-Depends: - debhelper (>= 9.20151004~), + debhelper (>= 10~), Build-Depends-Indep: libarchive-zip-perl, zip, zlib1g-dev, -Standards-Version: 3.9.8 +Rules-Requires-Root: no +Standards-Version: 4.1.1 Homepage: http://www.openarena.ws/ Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b openarena-players Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-players diff -Nru openarena-players-0.8.5split/debian/copyright openarena-players-0.8.5split/debian/copyright --- openarena-players-0.8.5split/debian/copyright 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/copyright 2017-10-30 11:08:11.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: OpenArena Upstream-Contact: http://openarena.ws/ Source: Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/mp-pak0-449831c5.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/mp-pak0-449831c5.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/mp-pak0-73428e1b.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/mp-pak0-73428e1b.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/mp-pak0-c8703d61.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/mp-pak0-c8703d61.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak0-37554497.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak0-37554497.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak0-b2b99e5d.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak0-b2b99e5d.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak0-d2225dd5.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak0-d2225dd5.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak6-patch085-087acd9c.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak6-patch085-087acd9c.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak6-patch085-438cf2c5.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak6-patch085-438cf2c5.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak6-patch085-6602cd55.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak6-patch085-6602cd55.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak6-patch088-4c6fe463.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak6-patch088-4c6fe463.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak6-patch088-bb90ea00.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak6-patch088-bb90ea00.qvm differ Binary files /tmp/tmpGzetDk/Mwdzs7pz_W/openarena-players-0.8.5split/debian/pak6-patch088-e27f432e.qvm and /tmp/tmpGzetDk/JM_DMB_0LG/openarena-players-0.8.5split/debian/pak6-patch088-e27f432e.qvm differ diff -Nru openarena-players-0.8.5split/debian/qvmbrute.c openarena-players-0.8.5split/debian/qvmbrute.c --- openarena-players-0.8.5split/debian/qvmbrute.c 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/qvmbrute.c 2017-10-30 11:08:11.000000000 +0000 @@ -14,18 +14,24 @@ #include #include #include +#include #include int main (int argc, char **argv) { + struct timespec start = { 0 }; + struct timespec end = { 0 }; u_int32_t i; unsigned char qvm[1024] = { 0 }; u_int32_t target = strtoul (argv[1], NULL, 0); char *subdir = ""; size_t fixed_len; u_int32_t crc; + double delta; + + clock_gettime (CLOCK_MONOTONIC, &start); /* subdirectory to embed in the dummy file */ if (argc > 3) { @@ -104,5 +110,9 @@ } } + clock_gettime (CLOCK_MONOTONIC, &end); + delta = end.tv_sec - start.tv_sec + (end.tv_nsec - start.tv_nsec) / 1e9; + printf ("QVM file %s generated in %.2f seconds\n", argv[2], delta); + return 0; } diff -Nru openarena-players-0.8.5split/debian/README.source openarena-players-0.8.5split/debian/README.source --- openarena-players-0.8.5split/debian/README.source 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/README.source 2017-10-30 11:08:11.000000000 +0000 @@ -58,11 +58,6 @@ modified openarena engine detects the magic number 'NTVE' and loads a native-code equivalent of the original QVM file. -For convenience, since they're slow to generate and entirely deterministic, -the generated fake QVM files are included in the source package and the git -repository. They can be deleted at any time and will be regenerated by the -next package build; it takes about a minute each on a 1.8GHz laptop. - Source code/build system (or lack of) ------------------------------------- diff -Nru openarena-players-0.8.5split/debian/rules openarena-players-0.8.5split/debian/rules --- openarena-players-0.8.5split/debian/rules 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/rules 2017-10-30 11:08:11.000000000 +0000 @@ -41,6 +41,7 @@ install -d $*/vm; \ install -v -m644 debian/$(*F)-$$crc.qvm $*/$$filename.qvm; \ touch --date='@$(SOURCE_DATE_EPOCH)' $*/$$filename.qvm; \ + touch --date='@$(SOURCE_DATE_EPOCH)' $*/vm; \ done < debian/$*.pk3.qvms rm -f $*.pk3 ( set -e; cd $*; while read crc filename; do \ diff -Nru openarena-players-0.8.5split/debian/source/lintian-overrides openarena-players-0.8.5split/debian/source/lintian-overrides --- openarena-players-0.8.5split/debian/source/lintian-overrides 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# only used (via override) if it would have been invoked anyway -missing-build-dependency-for-dh_-command dh_strip_nondeterminism => dh-strip-nondeterminism diff -Nru openarena-players-0.8.5split/debian/source/options openarena-players-0.8.5split/debian/source/options --- openarena-players-0.8.5split/debian/source/options 2016-06-28 10:54:02.000000000 +0000 +++ openarena-players-0.8.5split/debian/source/options 2017-10-30 11:08:11.000000000 +0000 @@ -1,2 +1,2 @@ tar-ignore=debian/svn-r* -extend-diff-ignore=debian/svn-r.*|CREDITS-0\.8\.8|readme_088\.txt +extend-diff-ignore=debian/svn-r.*