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

[Simon McVittie]

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

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

commit 4ad631709fff4ac875b2a6010319fc5cd94cadad
Merge: 25e44d7 e5e224f
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 24 10:17:23 2016 +0000

    Merge branch 'master' into openarena-085-data

 debian/changelog                |  8 +++++++-
 debian/clean                    |  8 ++++++--
 debian/gbp.conf                 |  2 --
 debian/rules                    | 35 ++++++++++++++++++++++++++++-------
 debian/source/lintian-overrides |  2 ++
 5 files changed, 43 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index ab10fd5,e7d5cb2..84e7b4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,5 @@@
 -openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
 +openarena-085-data (0.8.5split-7) UNRELEASED; 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)
diff --cc debian/gbp.conf
index ed5eb2f,52956a4..58aa145
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,9 -1,6 +1,7 @@@
  [DEFAULT]
  pristine-tar = False
 +debian-branch = openarena-085-data
  upstream-branch = there-is-no-upstream-branch
  overlay = True
- export-dir = ../build-area
- tarball-dir = ../tarballs
  compression = bzip2
 -debian-tag = debian/openarena-data/%(version)s
 +debian-tag = debian/openarena-085-data/%(version)s

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