[Pkg-nagios-changes] [pkg-icinga-web] 05/07: Cleanup local gbp.conf - managing dfsg in upstream now

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.

commit 69498a23483650028790992f427de86b3244a7e5
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sun Sep 8 18:39:32 2013 +0200

    Cleanup local gbp.conf - managing dfsg in upstream now
---
 debian/gbp.conf |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 82852c0..ba58e9b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,2 @@
 [DEFAULT]
 ;debian-branch = master
-;upstream-branch = upstream
-upstream-branch = upstream_dfsg
-
-[git-import-orig]
-pristine-tar = True
-upstream-branch = upstream

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git