From: R. Steve McKown <rsmckown@gmail.com>
Date: Wed, 26 May 2010 19:37:54 +0000 (-0600)
Subject: Update changelog, 2.1.1-4.3-1tmi
X-Git-Tag: debian/2.1.1-4.3-1tmi^0
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=42dd59303743467f7ce9027d2acbf5e9aabc57cc;hp=c562460e49244c27e0821ff67935c8d032862c21

Update changelog, 2.1.1-4.3-1tmi
---

diff --git a/.gbp.conf b/.gbp.conf
index 1a572bfc..de378b8c 100644
--- 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 4a0e19b5..53b7ef72 100644
--- 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