Update changelog, 2.1.1-4.3-1tmi

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

diff --git a/debian/changelog b/debian/changelog
index 4a0e19b596db99278bf07d75dc5c3b29f34630b7..53b7ef7230db1ea3cef32fbacfcbd5e08f15b4a4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-tinyos (2.1.1-4.3-0tmi) hardy; urgency=low
+tinyos (2.1.1-4.3-1tmi) hardy; urgency=low
 
   * Merge TinyOS 2.1.1.
   * Fix telosa and telosb BSL options.
+  * tos-bsl fix for new cp210x driver (ioctls start at SIOCDEVPRIVATE now).
 
- -- TMI Packages <pkgs@titaniummirror.com>  Fri, 07 May 2010 15:17:54 -0600
+ -- TMI Packages <pkgs@titaniummirror.com>  Wed, 26 May 2010 13:37:54 -0600
 
 tinyos (2.1.0-4.2-1tmi) hardy; urgency=low