Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into debian/2.0.2.2

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index fcb08f6471fd81b5800e90b2b3b8ece042306d9a..4f025634f0f0b7417ce1f0837ba8c7e18c447818 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 tinyos (2.0.2.2-1tinyos1) hardy; urgency=low
 
   * Package tinyOS upstream release 2.0.2.2
+  * Package is now signed.
 
- -- R. Steve McKown <rsmckown@gmail.conf>  Mon, 07 Dec 2009 13:48:29 -0700
+ -- TMI Packages <pkgs@titaniummirror.com>  Tue, 08 Dec 2009 14:08:03 -0700

diff --git a/debian/control.in b/debian/control.in
index 6c591fe582d797c5a254d8e5f45496b6ef57af8a..caeb69dbf6eeb32bfc1ccaab5da3abbb251600dc 100644 (file)
--- 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),