[merkaartor] 02/04: Merge branch 'master' into lenny-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Aug 22 19:29:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to annotated tag debian/0.14+svnfixes.20090912-1.bpo50+1
in repository merkaartor.
commit 8a7841de32863abc1d24f6f7e16a907af4bd2af5
Merge: 8870594 6a4e67f
Author: Bernd Zeimetz <bernd at bzed.de>
Date: Wed Sep 23 18:50:25 2009 +0200
Merge branch 'master' into lenny-backports
Conflicts:
debian/changelog
debian/control
debian/gbp.conf
debian/README.source | 9 +++++++++
debian/changelog | 35 ++++++++++++++++++++++++++++-------
debian/control | 7 ++++---
debian/copyright | 37 +++++++++++++++++++++++++++++++++++++
debian/gbp.conf | 32 ++++----------------------------
debian/patches/gdal-config | 14 ++++++--------
debian/patches/zlib-include | 4 ++--
debian/rules | 1 -
debian/uscan_repack.sh | 6 +++++-
debian/watch | 1 +
10 files changed, 96 insertions(+), 50 deletions(-)
diff --cc debian/gbp.conf
index 4653b85,418cefe..ab475f6
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,17 -1,13 +1,13 @@@
# Configuration file for git-buildpackage and friends
[DEFAULT]
- # the default build command:
- #builder = debuild -i\.git/ -I.git
- # the default clean command:
- #cleaner = debuild clean
# the default branch for upstream sources:
-upstream-branch = upstream
+upstream-branch = upstream-lenny-backports
# the default branch for the debian patch:
-debian-branch = master
+debian-branch = lenny-backports
# the default tag formats used:
- #upstream-tag = upstream/%(version)s
- #debian-tag = debian/%(version)s
+ upstream-tag = upstream/%(version)s
+ debian-tag = debian/%(version)s
# use pristine-tar:
pristine-tar = True
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git
More information about the Pkg-grass-devel
mailing list