Update integration branch for release/2.1.0-3

diff --git a/.gbp.conf b/.gbp.conf
index 510aed0b2605a5e162b2a443b5e6b59bd6338242..fa044c828626a1e1eab93b3b0c5a5d9b1832c346 100644 (file)
--- a/.gbp.conf
+++ b/.gbp.conf
@@ -5,7 +5,7 @@
 builder = pdebuild --debbuildopts '-d -i\.git/ -I.git'
 
 cleaner = fakeroot debian/rules clean
-upstream-branch = tinyos/2.1.0
+upstream-branch = release/2.1.0-3
 debian-branch = debian/2.1.0
 
 # the default tag formats used:

diff --git a/debian/changelog b/debian/changelog
index 72b9b40cb5cd1df3d5c39184de127e6a0160ad50..95b32866d571d7b4eb37cb180842d3ba84bbcd54 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-tinyos (2.1.0-1tinyos1) hardy; urgency=low
+tinyos (2.1.0-3-1tinyos1) hardy; urgency=low
 
-  * Package tinyOS upstream release 2.1.0.
+  * Package TMI release 2.1.0-3, based on official tinyOS release 2.1.0.
 
- -- R. Steve McKown <rsmckown@gmail.com>  Fri, 04 Dec 2009 15:14:38 -0700
+ -- R. Steve McKown <rsmckown@gmail>  Mon, 07 Dec 2009 11:06:20 -0700