From: Bdale Garbee <bdale@gag.com>
Date: Fri, 26 Aug 2011 15:37:01 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.0.1~6
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=674231773256bacd7acb4b5718c47412e47b813f;hp=3bfe8df44b575ca430ffaa051e20faa955a06c03

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 9561fdfe..00000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-# the default build command:
-#builder = debuild -i\.git/ -I.git
-# the default clean command:
-cleaner = debian/rules prebuild && debuild clean
-# 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]
-#upstream-branch = dfsgclean
-# uncomment this to automatically GPG sign tags
-#sign-tags = True
-# keyid to GPG sign tags with
-#keyid = 0xdeadbeef
-# push to a remote repository after a successful tag: 
-posttag = git push --mirror
-# use this for more svn-buildpackage like behaviour:
-export-dir = ../build-area/altos/
-#tarball-dir = ../tarballs/
-
-# Options only affecting git-import-orig
-[git-import-orig]
-#upstream-branch = newupstream
-#debian-branch = dfsgclean
-#filter = .svn
-
-# Options only affecting git-import-dsc
-[git-import-dsc]
-#upstream-branch = svn-upstream
-#filter = [ 'CVS', '.cvsignore' ]
-
-# Options only affecting git-dch
-[git-dch]
-#git-log = --no-merges
-#snapshot-number = snapshot + 1
-