Working on a solution for allowing multiple tinyos-source packages to be installed...

[tinyos-2.x.git] / control

diff --git a/control b/control
index 7d445ea675765d267b4bd1858d4d2a0dfa04f9cd..a06581033ae412128af45c8e78e641281f254e7d 100644 (file)
--- a/control
+++ b/control
@@ -6,14 +6,15 @@ 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]
+  libc6-dev-i386 [amd64], gcc-multilib [amd64], g++-multilib [amd64], emacs
 
 Package: tinyos
 Architecture: all
-Depends: tinyos-tools (>= 1.3.0), deputy-tinyos (>= 1.1), tinyos-root, tinyos-toolchain
+Depends: tinyos-tools (>= 1.3.0), deputy-tinyos (>= 1.1), tinyos-source-2.1.0-2,
+  tinyos-toolchain
 Conflicts:
 Priority: extra
-Description: Main TinyOS package.
+Description: Main TinyOS package
  To install TinyOS, install this package.
 
 Package: tinyos-tools
@@ -21,23 +22,27 @@ Architecture: any
 Depends: python, python-serial, nesc (>= 1.3.0), ${shlibs:Depends}
 Conflicts:
 Priority: extra
-Description: Development support tools for TinyOS.
+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
+Package: tinyos-source-2.1.0-2
 Architecture: all
 Depends:
-Provides: tinyos-root
+Provides: tinyos-source
 Conflicts:
 Priority: extra
-Description: TinyOS source code tree.
- TinyOS source is required to compile TinyOS applications.
+Description: TinyOS source code tree
+ TinyOS source is required to compile TinyOS applications.  This package
+ provides TinyOS release 2.1.0 enhanced with TMI updates, version
+ 2.  You may have multiple tinyos-source packages installed at one
+ time.
 
 Package: tinyos-avr
 Architecture: all
-Depends: avr-tinyos-base, avr-binutils-tinyos, avr-gcc-tinyos, avr-libc-tinyos, avrdude-tinyos
+Depends: avr-tinyos-base, avr-binutils-tinyos, avr-gcc-tinyos, avr-libc-tinyos,
+  avrdude-tinyos
 Provides: tinyos-toolchain
 Conflicts:
 Priority: extra