[openarena-data] 01/02: Merge branch 'master' into openarena-oacmp1
Simon McVittie
smcv at debian.org
Thu Mar 24 10:42:53 UTC 2016
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 c6d790b082783bba036123fec6b84d8a6b131608
Merge: e35f066 095069c
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 24 10:21:38 2016 +0000
Merge branch 'master' into openarena-oacmp1
debian/changelog | 7 +++++++
debian/clean | 8 ++++++--
debian/gbp.conf | 2 --
debian/rules | 35 ++++++++++++++++++++++++++++-------
debian/source/lintian-overrides | 2 ++
5 files changed, 43 insertions(+), 11 deletions(-)
diff --cc debian/gbp.conf
index c55e882,52956a4..dca7769
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,8 -1,6 +1,6 @@@
[DEFAULT]
pristine-tar = False
+debian-branch = openarena-oacmp1
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-oacmp1/%(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