Update git files from debian/2.1.0

diff --git a/.gbp.conf b/.gbp.conf
new file mode 100644 (file)
index 0000000..1a572bf
--- /dev/null
+++ b/.gbp.conf
@@ -0,0 +1,41 @@
+# 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.3rc
+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/.gitignore b/.gitignore
index 93b03677d97edacb4f085ff1c09136cde7be9a80..3587edeba200a477d828f9ed97b9ab055af13a7f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 support/sdk/java/net/tinyos/message/SerialPacket.java
 support/sdk/java/net/tinyos/packet/Serial.java
 support/sdk/java/net/tinyos/tools/PrintfMsg.java
+/debian/control