Fix compile error, the indenting really needs to be fixed here

[oweals/busybox.git] / debian / control

diff --git a/debian/control b/debian/control
index bbbf86e09e23c2da05bb7fa443eb3b023d2dd16d..d45758c23180e03db161f678f46231222955735d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,38 +1,41 @@
-Source: busybox
+Source: busybox-cvs

 Priority: optional
 Priority: optional

-Maintainer: Erik Andersen <andersee@debian.org>
-Build-Depends: debhelper
-Standards-Version: 3.1.1
+Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Uploaders: Erik Andersen <andersee@debian.org>, Bastian Blank <waldi@debian.org>, Tollef Fog Heen <tfheen@debian.org>, Glenn McGrath <bug1@debian.org>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.0

 
 

-Package: busybox
+Package: busybox-cvs

 Architecture: any
 Depends: ${shlibs:Depends}
 Architecture: any
 Depends: ${shlibs:Depends}

-Conflicts: binutils, bsdutils, console-tools, cpio, debianutils, dnsutils, dpkg, fbset, fdflush, fileutils, grep, gzip, hostname, modutils, mount, netbase, procps, psmisc, sed, sharutils, shellutils, sysklogd, sysvinit, tar, textutils, update, util-linux
-Replaces: netbase
+Conflicts: busybox-cvs-static, busybox, busybox-static
+Replaces: busybox-cvs-static, busybox, busybox-static

 Section: utils
 Section: utils

-Description: Tiny utilities for the debian-installer and for embedded systems. 
+Description: Tiny utilities for small and embedded systems

  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common

- utilities you would usually find on your desktop system (i.e. ls, cp, mv,
- mount, tar, etc).  The utilities in BusyBox generally have fewer options than
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than

  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.
  .
  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.
  .

- BusyBox is used by the debian-installer.  Installing BusyBox onto your Debian
- system is not recommended, unless you are intended to make a very small
- embedded system.  Chances are good that for embedded systems, you will want to
- recompile to only include the tools and utilities you wish to include.
+ This package installs the BusyBox binary but does not install symlinks
+ for any of the supported utilities.  You can use /bin/busybox --install
+ to install BusyBox to the current directory (you do not want to do this
+ in / on your Debian system!).

 
 

-Package: busybox-static
+Package: busybox-cvs-static

 Architecture: any
 Depends: ${shlibs:Depends}
 Architecture: any
 Depends: ${shlibs:Depends}

+Conflicts: busybox-cvs, busybox-static, busybox
+Replaces: busybox-cvs, busybox-static, busybox

 Section: shells
 Section: shells

-Description: Provides a stand alone rescue shell with tons of builtin utilities. 
+Description: Standalone rescue shell with tons of builtin utilities

  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common

- utilities you would usually find on your desktop system (i.e. ls, cp, mv,
- mount, tar, etc).  The utilities in BusyBox generally have fewer options than
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than

  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.
  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.


@@ -44,3 +47,42 @@ Description: Provides a stand alone rescue shell with tons of builtin utilities.
  your system from certain destruction.  Invoke "busybox", and it will list the
  available builtin commands.
 
  your system from certain destruction.  Invoke "busybox", and it will list the
  available builtin commands.
 

+Package: busybox-cvs-udeb
+Architecture: any
+Depends: ${shlibs:Depends}
+Section: debian-installer
+Conflicts: busybox-udeb
+Enhances: busybox-cvs-net-udeb
+Priority: extra
+Description: Tiny utilities for the debian-installer
+ BusyBox combines tiny versions of many common UNIX utilities into a single
+ small executable. It provides minimalist replacements for the most common
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than
+ their full-featured GNU cousins; however, the options that are included
+ provide the expected functionality and behave very much like their GNU
+ counterparts.
+ .
+ busybox-udeb is used by the debian-installer, so unless you are working
+ on the debian-installer, this package is not for you.  Installing this 
+ on your Debian system is a very, very bad idea.  You have been warned.
+
+Package: busybox-cvs-net-udeb
+Architecture: i386
+Depends: ${shlibs:Depends}
+Section: debian-installer
+Conflicts: busybox-udeb
+Priority: extra
+Description: Tiny utilities for the debian-installer network images
+ BusyBox combines tiny versions of many common UNIX utilities into a single
+ small executable. It provides minimalist replacements for the most common
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than
+ their full-featured GNU cousins; however, the options that are included
+ provide the expected functionality and behave very much like their GNU
+ counterparts.
+ .
+ busybox-udeb is used by the debian-installer, so unless you are working
+ on the debian-installer, this package is not for you.  Installing this 
+ on your Debian system is a very, very bad idea.  You have been warned.
+