Merge commit 'bc54b6cd239fe6f2a54b2fe2a1739ab58bde19e0' into debian/2.0.2.2

Conflicts:
	debian/changelog

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

diff --cc debian/control.in
index 6c591fe582d797c5a254d8e5f45496b6ef57af8a,0000000000000000000000000000000000000000..caeb69dbf6eeb32bfc1ccaab5da3abbb251600dc
mode 100644,000000..100644
--- 1/debian/control.in
--- /dev/null
+++ b/debian/control.in
@@@ -1,71 -1,0 +1,71 @@@
- Maintainer: R. Steve McKown <rsmckown@gmail.com>
 +Source: tinyos
 +Section: devel
 +Priority: optional
++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),
 +  dejagnu (>= 1.4.2-1.1), dpatch, file, bzip2, lsb-release, nesc (>= 1.3.0),
 +  libc6-dev-i386 [amd64], gcc-multilib [amd64], g++-multilib [amd64]
 +
 +Package: tinyos
 +Architecture: all
 +Depends: tinyos-tools (>= 1.3.0), deputy-tinyos (>= 1.1), tinyos-source,
 +  tinyos-toolchain
 +Conflicts:
 +Priority: extra
 +Description: Main TinyOS package
 + To install TinyOS, install this package.  To remove TinyOS, remove this
 + package.
 +
 +Package: tinyos-tools
 +Architecture: any
 +Depends: python, python-serial, nesc (>= 1.3.0), ${shlibs:Depends}
 +Conflicts:
 +Priority: extra
 +Description: Development support tools for TinyOS
 + Includes various support tools, including uisp, motelist, pybsl, mig, ncc and
 + nesdoc. The source for these tools is found in the TinyOS CVS repository
 + under tinyos-2.x/tools.
 +
 +Package: tinyos-source
 +Architecture: all
 +Depends: tinyos-source-RELEASE-VERSION
 +Conflicts:
 +Priority: extra
 +Description: TinyOS source meta package
 + This package installs the latest tinyos source tree package,
 + tinyos-source-RELEASE-VERSION, when you install or upgrade the tinyos package.
 + Command line users may need to issue 'apt-get dist-upgrade' if you see the
 + message that tinyos-source is being held back.
 +
 +Package: tinyos-source-RELEASE-VERSION
 +Architecture: all
 +Provides: tinyos-source
 +Depends: tinyos
 +Conflicts:
 +Priority: extra
 +Description: TinyOS source code tree
 + Provides the official TinyOS TOS-VERSION release source tree with TMI version
 + TMI-VERSION enhancements.
 +
 +Package: tinyos-avr
 +Architecture: all
 +Depends: avr-tinyos-base, avr-binutils-tinyos, avr-gcc-tinyos, avr-libc-tinyos,
 +  avrdude-tinyos
 +Provides: tinyos-toolchain
 +Conflicts:
 +Priority: extra
 +Description: TinyOS avr toolchain
 + This dummy package allows for easy installation of the avr toolchain
 + for building TinyOS applications for avr microprocessor based systems.
 +
 +Package: tinyos-msp430
 +Architecture: all
 +Depends: msp430-binutils, msp430-gcc, msp430-libc
 +Provides: tinyos-toolchain
 +Conflicts:
 +Priority: extra
 +Description: TinyOS msp430 toolchain
 + This dummy package allows for easy installation of the msp430 toolchain
 + for building TinyOS applications for msp430 microprocessor based systems.