Update changelog and .gbp.conf for release/2.1.1-4.4

diff --git a/.gbp.conf b/.gbp.conf
index de378b8ce7dd61154b189f7182bd74f7b207ff09..db5ae2ef7f90091a36cffaed2b05eb8c9262521c 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.1-4.3
+upstream-branch = release/2.1.1-4.4
 debian-branch = debian/2.1.1
 
 # the default tag formats used:

diff --git a/debian/changelog b/debian/changelog
index 53b7ef7230db1ea3cef32fbacfcbd5e08f15b4a4..10b8a0e45b22fc0b0baa1e2dcaf1ed40447dff1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tinyos (2.1.1-4.4-1tmi) hardy; urgency=low
+
+  * Fix broken wait delay in msp430 platforms, where compiler optimized out
+    the wait loop needed to allow the 32kHz crystal time to stabilize.
+  * New system components SharedArbiterC and SharedSplitControlC.
+  * Various MSP430 USCI UART fixes.
+  * Revert change to TOSMAKE_PATH in 2.1.1.  System defined TINYOS_MAKE_PATH
+    should be added to the end of TOSMAKE_PATH so user paths are first
+    and can therefore override system paths.
+
+ -- TMI Packages <pkgs@titaniummirror.com>  Wed, 03 Nov 2010 14:36:23 -0600
+
 tinyos (2.1.1-4.3-1tmi) hardy; urgency=low
 
   * Merge TinyOS 2.1.1.