Update control files for 2.1.0-4.2.

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

diff --git a/debian/changelog b/debian/changelog
index 203f0f66d0d17a15b73461ade1acc29c2204ca69..8cd4412db178faec0da42144a49cc1c4604929da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tinyos (2.1.0-4.2-1tmi) hardy; urgency=low
+
+  * Update tinyos.sh to fix improper recording of current TOSROOT.
+
+ -- TMI Packages <pkgs@titaniummirror.com>  Thu, 06 May 2010 09:13:41 -0600
+
 tinyos (2.1.0-4.1-1tmi) hardy; urgency=low
 
   * Update tinyos.sh, postinstall exec of tos-install-jni, ensure tinyos.jar