Update integration branch for release/2.1.0-4.

diff --git a/.gbp.conf b/.gbp.conf
index fa044c828626a1e1eab93b3b0c5a5d9b1832c346..0611120374f712bb5d4f8d3b11db809271868221 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 = release/2.1.0-3
+upstream-branch = release/2.1.0-4
 debian-branch = debian/2.1.0
 
 # the default tag formats used:

diff --git a/debian/changelog b/debian/changelog
index 9ae1e85b8d1efd5a057ad982fcea8bbf6e0f4632..d5e623bc8635d948213b24e0c1f3d60c1b6a9877 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tinyos (2.1.0-4-1tmi) hardy; urgency=low
+
+  * Package TMI release 2.1.0-4, based on official tinyOS release 2.1.0.
+
+ -- TMI Packages <pkgs@titaniummirror.com>  Thu, 22 Apr 2010 15:52:49 -0600
+
 tinyos (2.1.0-3-2tmi) hardy; urgency=low
 
   * Package TMI release 2.1.0-3, based on official tinyOS release 2.1.0.