This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch openarena-misc in repository openarena-data.
commit f9c401432430491ad5cc6b75939b58170790dbb9 Merge: 186034b 095069c Author: Simon McVittie <[email protected]> Date: Thu Mar 24 10:19:56 2016 +0000 Merge branch 'master' into openarena-misc 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 ccab23b,e7d5cb2..e3f4d1f --- a/debian/changelog +++ b/debian/changelog @@@ -1,6 -1,6 +1,5 @@@ -openarena-data (0.8.5split-7) UNRELEASED; urgency=medium +openarena-misc (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 e1495b2,52956a4..77f67f6 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@@ -1,9 -1,6 +1,7 @@@ [DEFAULT] pristine-tar = False +debian-branch = openarena-misc 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-misc/%(version)s -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openarena-data.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
