[SCM] freetuxtv/master: Added gbp.conf

[rak at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 19c2c4f261d24221400de19c064a17c64a837015
Author: Ryan Kavanagh <rak at debian.org>
Date:   Fri Apr 13 17:18:26 2012 -0400

    Added gbp.conf

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..4bf9f0f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,14 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+pristine-tar = True
+sign-tags = True
+
+[git-import-orig]
+# don't merge to debian branch by default:
+merge = False
+
+[git-buildpackage]
+upstream-branch = dfsg_clean

-- 
freetuxtv packaging