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 5b9f8f676f2d4bdd560082cdc477afb96337af0a..d45758c23180e03db161f678f46231222955735d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,9 @@
 Source: busybox-cvs
 Priority: optional
-Maintainer: Erik Andersen <andersee@debian.org>
-Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0)
-Build-Depends-Indep: sgmltools-lite, w3m
-Standards-Version: 3.2.1.0
-
-Package: busybox-cvs-doc
-Architecture: all
-Section: doc
-Description: Documentation for busybox
- Documentation in various formats on busybox commands and their options.
+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-cvs
 Architecture: any
@@ -17,7 +11,7 @@ Depends: ${shlibs:Depends}
 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,
@@ -37,7 +31,7 @@ Depends: ${shlibs:Depends}
 Conflicts: busybox-cvs, busybox-static, busybox
 Replaces: busybox-cvs, busybox-static, busybox
 Section: shells
-Description: Standalone 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,
@@ -58,8 +52,8 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Section: debian-installer
 Conflicts: busybox-udeb
-Provides: busybox-udeb
-Priority: standard
+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
@@ -73,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.
+