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 09990bf2a3e99e67ec225053ecbc9691872a2c5b..d45758c23180e03db161f678f46231222955735d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,17 @@
-Source: busybox
+Source: busybox-cvs
 Priority: optional
-Maintainer: Erik Andersen <andersee@debian.org>
-Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0)
-Standards-Version: 3.2.1.0
+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}
-Conflicts: busybox-static
-Replaces: busybox-static 
+Conflicts: busybox-cvs-static, busybox, busybox-static
+Replaces: busybox-cvs-static, busybox, busybox-static
 Section: utils
-Description: Tiny utilities for small and 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
  utilities you would usually find on your desktop system (i.e., ls, cp, mv,
@@ -24,13 +25,13 @@ Description: Tiny utilities for small and embedded systems.
  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}
-Conflicts: busybox
-Replaces: busybox
+Conflicts: busybox-cvs, busybox-static, busybox
+Replaces: busybox-cvs, busybox-static, busybox
 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
  utilities you would usually find on your desktop system (i.e., ls, cp, mv,
@@ -46,10 +47,13 @@ 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.
 
-Package: busybox-udeb
+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
@@ -63,3 +67,22 @@ Description: Tiny utilities for the debian-installer
  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.
+