[merkaartor] 09/23: Rename old style config sections in gbp.conf.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository merkaartor.

commit 03ee217ecf1de5bad02f9d0f4840e44e3b540390
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 18 10:31:08 2015 +0200

    Rename old style config sections in gbp.conf.
---
 debian/changelog |  1 +
 debian/gbp.conf  | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b870b4..0a465ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium
   * Restructure control file with cme.
   * Update Vcs-Browser URL to use HTTPS.
   * Override dh_install to use --list-missing.
+  * Rename old style config sections in gbp.conf.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 18 Sep 2015 01:17:53 +0200
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 418cefe..a89eb4e 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,29 +1,40 @@
 # Configuration file for git-buildpackage and friends
 
 [DEFAULT]
+
 # the default branch for upstream sources:
 upstream-branch = upstream
+
 # the default branch for the debian patch:
 debian-branch = master
+
 # the default tag formats used:
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
+
 # use pristine-tar:
 pristine-tar = True
 
-# Options only affecting git-buildpackage
-[git-buildpackage]
+
+# Options only affecting gbp-buildpackage
+[buildpackage]
+
 # uncomment this to automatically GPG sign tags
 sign-tags = True
 
-# Options only affecting git-dch
-[git-dch]
+
+# Options only affecting gbp-dch
+[dch]
+
 #git-log = --no-merges
 #snapshot-number = snapshot + 1
+
 # include 0 digits of the commit id in the changelog enty
 id-length = 8
+
 # don't include information from meta tags
 meta = True
+
 # what tags to look for to generate bug-closing changelog entries
 meta-closes = Closes|LP
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git