[SCM] gmerlin-encoders/master: Clean gbp.conf, get rid of unnecessary opts.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9ec1e0406def88d98cfe07cbdb11102aa94f154e
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 10 01:44:01 2012 +0100

    Clean gbp.conf, get rid of unnecessary opts.

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1c1369d..7e38616 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,8 +1,4 @@
 # Configuration file for git-buildpackage and friends
 
 [DEFAULT]
-debian-branch = master.ubuntu
-upstream-branch = upstream
-debian-tag = ubuntu/%(version)s
 pristine-tar = True
-sign-tags = True

-- 
gmerlin-encoders packaging