[qgis] 01/07: Update gbp.conf to use --no-rollback for gbp import-orig.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 53877f6bb7221fb966530e003eade9b943b16c6b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 21 20:03:14 2017 +0200

    Update gbp.conf to use --no-rollback for gbp import-orig.
---
 debian/changelog | 6 ++++++
 debian/gbp.conf  | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c6dd670..b8fe61d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.14.16+dfsg-2) UNRELEASED; urgency=medium
+
+  * Update gbp.conf to use --no-rollback for gbp import-orig.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 21 Jul 2017 20:03:09 +0200
+
 qgis (2.14.16+dfsg-1) unstable; urgency=medium
 
   * Drop libopenscenegraph-dev build dependency, pulled in via libosgearth-dev.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1394d98..f94ba63 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -14,3 +14,6 @@ upstream-tag = upstream/%(version)s
 
 # Always use pristine-tar.
 pristine-tar = True
+
+[import-orig]
+rollback = False

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