[openarena-data] 01/03: Merge branch 'master' into openarena-088-data

[Simon McVittie]

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

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

commit 65dbf9ae36974933160d90aaef1a6678eb28fc95
Merge: 2e04af4 e5e224f
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 24 10:16:04 2016 +0000

    Merge branch 'master' into openarena-088-data

 debian/changelog | 6 ++++++
 debian/clean     | 1 +
 2 files changed, 7 insertions(+)

diff --cc debian/changelog
index b615acd,e7d5cb2..bf1d7e7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,12 +1,11 @@@
 -openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
++openarena-088-data (0.8.8-6) UNRELEASED; urgency=medium
++
++  * Clean up generated openarena-088-data.README.Debian
++
++ -- Simon McVittie <smcv at debian.org>  Thu, 24 Mar 2016 10:15:28 +0000
++
 +openarena-088-data (0.8.8-5) 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

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