From: R. Steve McKown <rsmckown@gmail.com>
Date: Sun, 1 Jul 2012 02:57:16 +0000 (-0600)
Subject: git-buildpackage can now see debian/gbp.conf
X-Git-Tag: debian/2.1.1-4.4-2tmi^0
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=434c0717821e853e0e8f10542abe87c764cc37cb

git-buildpackage can now see debian/gbp.conf
---

diff --git a/.gbp.conf b/.gbp.conf
deleted file mode 100644
index db5ae2ef..00000000
--- a/.gbp.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-#builder = debuild -d -us -uc -i\.git/ -I.git
-builder = pdebuild --debbuildopts '-d -i\.git/ -I.git'
-
-cleaner = fakeroot debian/rules clean
-upstream-branch = release/2.1.1-4.4
-debian-branch = debian/2.1.1
-
-# the default tag formats used:
-#upstream-tag = upstream/%(version)s
-#debian-tag = debian/%(version)s
-
-# 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 git.example.com
-# use this for more svn-buildpackage like bahaviour:
-#export-dir = ../build-area/
-#tarball-dir = ../tarballs/
-
-# Options only affecting git-import-orig
-[git-import-orig]
-#upstream-branch = newupstream
-#debian-branch = dfsgclean
-
-# Options only affecting git-import-dsc
-[git-import-dsc]
-#upstream-branch = svn-upstream
-
-# Options only affecting git-dch
-[git-dch]
-#git-log = --no-merges
-#snapshot-number = snapshot + 1
-
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 00000000..66a4d00f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,42 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+#builder = debuild -d -us -uc -i\.git/ -I.git
+builder = pdebuild --debbuildopts '-d -i\.git/ -I.git'
+
+cleaner = fakeroot debian/rules clean
+upstream-branch = release/2.1.1-4.4
+upstream-tree = branch
+debian-branch = debian/2.1.1
+
+# the default tag formats used:
+#upstream-tag = upstream/%(version)s
+#debian-tag = debian/%(version)s
+
+# 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 git.example.com
+# use this for more svn-buildpackage like bahaviour:
+#export-dir = ../build-area/
+#tarball-dir = ../tarballs/
+
+# Options only affecting git-import-orig
+[git-import-orig]
+#upstream-branch = newupstream
+#debian-branch = dfsgclean
+
+# Options only affecting git-import-dsc
+[git-import-dsc]
+#upstream-branch = svn-upstream
+
+# Options only affecting git-dch
+[git-dch]
+#git-log = --no-merges
+#snapshot-number = snapshot + 1
+