[openarena-data] 01/02: Merge branch 'master' into openarena-textures
Simon McVittie
smcv at debian.org
Thu Mar 24 10:42:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch openarena-textures
in repository openarena-data.
commit 3a2b37c15a46febec3d147068cb7d82fcf78cda8
Merge: 00fc9f0 095069c
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 24 10:22:44 2016 +0000
Merge branch 'master' into openarena-textures
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 9716500,e7d5cb2..b23ba61
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,6 +1,5 @@@
-openarena-data (0.8.5split-7) UNRELEASED; urgency=medium
+openarena-textures (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 0da5723,52956a4..e08477d
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,9 -1,6 +1,7 @@@
[DEFAULT]
pristine-tar = False
+debian-branch = openarena-textures
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-textures/%(version)s
--
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