Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into debian/2.1.0

Conflicts:
	debian/changelog

diff --git a/changelog b/changelog
index 95b32866d571d7b4eb37cb180842d3ba84bbcd54..9ae1e85b8d1efd5a057ad982fcea8bbf6e0f4632 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
-tinyos (2.1.0-3-1tinyos1) hardy; urgency=low
+tinyos (2.1.0-3-2tmi) hardy; urgency=low
 
   * Package TMI release 2.1.0-3, based on official tinyOS release 2.1.0.
+  * Package is now signed.
 
- -- R. Steve McKown <rsmckown@gmail>  Mon, 07 Dec 2009 11:06:20 -0700
+ -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:57:46 -0700

diff --git a/control.in b/control.in
index 6c591fe582d797c5a254d8e5f45496b6ef57af8a..caeb69dbf6eeb32bfc1ccaab5da3abbb251600dc 100644 (file)
--- a/control.in
+++ b/control.in
@@ -1,7 +1,7 @@
 Source: tinyos
 Section: devel
 Priority: optional
-Maintainer: R. Steve McKown <rsmckown@gmail.com>
+Maintainer: TMI Packages <pkgs@titaniummirror.com>
 Standards-Version: 3.7.2.0
 Build-Depends: dpkg-dev (>= 1.13.9), autoconf (>= 2.13), automake, bison, flex,
   gettext, texinfo, binutils (>= 2.9.5.0.12), gcc (>= 4:4.2.2),