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

[Simon McVittie]

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

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

commit e9bad1d012e797f1813ac3cd5e03d37656deb10e
Merge: d886239 095069c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 24 10:19:46 2016 +0000

    Merge branch 'master' into openarena-maps

 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 113cc4d,e7d5cb2..a37c980
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,5 @@@
 -openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
 +openarena-maps (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 eac3c8d,52956a4..7930123
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,9 -1,6 +1,7 @@@
  [DEFAULT]
  pristine-tar = False
 +debian-branch = openarena-maps
  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-maps/%(version)s

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