Fix debian/master changelog to fit our needs

[tinyos-2.x.git] / control

diff --git a/control b/control
index 7d445ea675765d267b4bd1858d4d2a0dfa04f9cd..7dfc559f65076d106c4d7f9da9c0271076622956 100644 (file)
--- a/control
+++ b/control
@@ -6,38 +6,53 @@ 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,
+  tinyos-toolchain
 Conflicts:
 Priority: extra
-Description: Main TinyOS package.
- To install TinyOS, install this package.
+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.
+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:
-Provides: tinyos-root
+Depends: tinyos-source-2.1.0-2
 Conflicts:
 Priority: extra
-Description: TinyOS source code tree.
- TinyOS source is required to compile TinyOS applications.
+Description: TinyOS source meta package
+ This package installs the latest tinyos source tree package,
+ tinyos-source-2.1.0-2, 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-2.1.0-2
+Architecture: all
+Provides: tinyos-source
+Depends: tinyos
+Conflicts:
+Priority: extra
+Description: TinyOS source code tree
+ Provides the official TinyOS 2.1.0 release source tree with TMI version
+ 2 enhancements.
 
 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