[openarena-data] 01/02: Merge branch 'master' into openarena-oacmp1

Simon McVittie smcv at debian.org
Mon Oct 30 14:02:17 UTC 2017 

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch openarena-oacmp1
in repository openarena-data.

commit cf2eec101d348f814a3a837e3e90d3a658333c7e
Merge: 9d145ee aea947a
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Oct 30 11:06:12 2017 +0000

    Merge branch 'master' into openarena-oacmp1

 debian/README.source              |   5 -----
 debian/changelog                  |  22 ++++++++++++++++++++++
 debian/compat                     |   2 +-
 debian/control                    |   5 +++--
 debian/copyright                  |   2 +-
 debian/mp-pak0-449831c5.qvm       | Bin 23 -> 0 bytes
 debian/mp-pak0-73428e1b.qvm       | Bin 23 -> 0 bytes
 debian/mp-pak0-c8703d61.qvm       | Bin 23 -> 0 bytes
 debian/pak0-37554497.qvm          | Bin 20 -> 0 bytes
 debian/pak0-b2b99e5d.qvm          | Bin 20 -> 0 bytes
 debian/pak0-d2225dd5.qvm          | Bin 20 -> 0 bytes
 debian/pak6-patch085-087acd9c.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch085-438cf2c5.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch085-6602cd55.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch088-4c6fe463.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch088-bb90ea00.qvm | Bin 29 -> 0 bytes
 debian/pak6-patch088-e27f432e.qvm | Bin 29 -> 0 bytes
 debian/qvmbrute.c                 |  10 ++++++++++
 debian/rules                      |   1 +
 debian/source/lintian-overrides   |   2 --
 debian/source/local-options       |   1 -
 debian/source/options             |   2 +-
 22 files changed, 39 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index f6c8058,ceca587..e9220ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -26,15 -37,27 +26,37 @@@ openarena-oacmp1 (3-2) unstable; urgenc
    * Use SOURCE_DATE_EPOCH for timestamps, and build-depend on the
      debhelper version that defines it
  
 - -- Simon McVittie <smcv at debian.org>  Tue, 28 Jun 2016 10:38:50 +0100
 + -- Simon McVittie <smcv at debian.org>  Tue, 28 Jun 2016 11:52:15 +0100
  
 -openarena-data (0.8.5split-7) unstable; urgency=medium
 +openarena-oacmp1 (3-1) unstable; urgency=medium
  
    * Switch Vcs-Browser to cgit and https
 -  * Add shared files for the OpenArena Community Map Pack, volume 1
 -    (available as the openarena-oacmp1 source package, but the majority
 -    of the debian/ directory is duplicated to simplify merging)
 -  * Standards-Version: 3.9.7 (no changes needed)
 -  * Normalize packaging via wrap-and-sort -abst
 -  * Use https for Vcs-Git (lintian: vcs-field-uses-insecure-uri)
 -  * gbp.conf: do not set export-dir, tarball-dir: this is a local
 -    preference for the developer doing the build, not something that
 -    should be in the VCS
 -  * Verify at dh_builddeb time that the PK3 is compatible with upstream
 -  * Do not put the PK3 files through dh_strip_nondeterminism: order
 -    is important for these files (see #819113)
 -  * Clean up generated openarena-088-data.README.Debian
 +  * New source package for the OpenArena Community Map Pack, volume 1
 +
 + -- Simon McVittie <smcv at debian.org>  Sat, 09 May 2015 14:29:46 +0100
 +
++openarena-data (0.8.5split-10) unstable; urgency=medium
++
++  * 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
++
++ -- Simon McVittie <smcv at debian.org>  Mon, 30 Oct 2017 11:00:15 +0000
+ 
 - -- Simon McVittie <smcv at debian.org>  Thu, 24 Mar 2016 10:23:22 +0000
++openarena-data (0.8.5split-9) unstable; urgency=medium
++
++  * 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 <smcv at debian.org>  Sun, 25 Sep 2016 17:38:41 +0100
+ 
  openarena-data (0.8.5split-6) unstable; urgency=medium
  
    * Actually include the change to use zip -X -o, which somehow
diff --cc debian/control
index 9db573a,9f4b105..559a914
--- a/debian/control
+++ b/debian/control
@@@ -11,23 -11,26 +11,24 @@@ 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
 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/
 +Vcs-Git: https://anonscm.debian.org/git/pkg-games/openarena-data.git -b openarena-oacmp1
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openarena-data.git/log/?h=openarena-oacmp1
  
 -Package: openarena-data
 +Package: openarena-oacmp1
  Architecture: all
  Depends:
 - openarena-081-maps,
 - openarena-081-misc,
 - openarena-081-players,
 - openarena-081-players-mature,
 - openarena-081-textures,
 - openarena-085-data,
 + openarena-088-data,
   ${misc:Depends},
 +Enhances:
 + openarena,
 + openarena-server,
  Breaks:
 - openarena (<< 0.8.1-8~),
 - openarena-server (<< 0.8.1-8~),
 -Description: OpenArena game data
 + openarena (<< 0.8.8),
 + openarena-server (<< 0.8.8),
 +Description: OpenArena Community Map Pack 1
   OpenArena is an open-source content package for the Quake III
   engine, effectively creating a free stand-alone game similar to
   Quake III Arena.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git

More information about the Pkg-games-commits mailing list