Update changelog and .gbp.conf

diff --git a/.gbp.conf b/.gbp.conf
new file mode 100644 (file)
index 0000000..1fe9013
--- /dev/null
+++ b/.gbp.conf
@@ -0,0 +1,43 @@
+# Configuration file for git-buildpackage and friends
+#
+# Copy this to .gbp.conf in the git repo top directory after merging and
+# edit as needed.
+
+[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 = tinyos/2.0.2.2
+debian-branch = debian/2.0.2.2
+
+# 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/changelog b/debian/changelog
index 72b9b40cb5cd1df3d5c39184de127e6a0160ad50..fcb08f6471fd81b5800e90b2b3b8ece042306d9a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-tinyos (2.1.0-1tinyos1) hardy; urgency=low
+tinyos (2.0.2.2-1tinyos1) hardy; urgency=low
 
-  * Package tinyOS upstream release 2.1.0.
+  * Package tinyOS upstream release 2.0.2.2
 
- -- R. Steve McKown <rsmckown@gmail.com>  Fri, 04 Dec 2009 15:14:38 -0700
+ -- R. Steve McKown <rsmckown@gmail.conf>  Mon, 07 Dec 2009 13:48:29 -0700