From: R. Steve McKown <rsmckown@gmail.com>
Date: Tue, 8 Dec 2009 21:49:02 +0000 (-0700)
Subject: Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into tmp
X-Git-Tag: debian/2.1.0-2tmi
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=3eb42a5d50f8591e6c9831032753409d6be65ae8;hp=0d437416c389ef0c34cd365c73c2f2d3279cb59a;p=tinyos-2.x.git

Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into tmp

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 72b9b40c..b0e11c03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-tinyos (2.1.0-1tinyos1) hardy; urgency=low
+tinyos (2.1.0-2tmi) hardy; urgency=low
 
   * Package tinyOS upstream release 2.1.0.
+  * Package is now signed.
 
- -- R. Steve McKown <rsmckown@gmail.com>  Fri, 04 Dec 2009 15:14:38 -0700
+ -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:48:12 -0700
diff --git a/debian/control.in b/debian/control.in
index 6c591fe5..caeb69db 100644
--- a/debian/control.in
+++ b/debian/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),