Name package busybox-unstable to keep a clean seperation between the official packages.

git-svn-id: svn://busybox.net/trunk/busybox@6023 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 11 insertions, 9 deletions

diff --git a/debian/control b/debian/control
index 2a0ffa8bf..d619b82ba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,21 @@
-Source: busybox
+Source: busybox-unstable
 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-doc
+Package: busybox-unstable-doc
 Architecture: all
 Section: doc
 Description: Documentation for busybox
  Documentation in various formats on busybox commands and their options.
 
-Package: busybox
+Package: busybox-unstable
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: busybox-static
-Replaces: busybox-static 
+Conflicts: busybox-unstable-static, busybox, busybox-static
+Replaces: busybox-unstable-static, busybox, busybox-static
 Section: utils
 Description: Tiny utilities for small and embedded systems. 
  BusyBox combines tiny versions of many common UNIX utilities into a single
@@ -31,11 +31,11 @@ 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-unstable-static
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: busybox
-Replaces: busybox
+Conflicts: busybox-unstable, busybox-static, busybox
+Replaces: busybox-unstable, busybox-static, busybox
 Section: shells
 Description: Standalone rescue shell with tons of builtin utilities. 
  BusyBox combines tiny versions of many common UNIX utilities into a single
@@ -53,10 +53,12 @@ Description: Standalone 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-unstable-udeb
 Architecture: any
 Depends: ${shlibs:Depends}
 Section: debian-installer
+Conflicts: busybox-udeb
+Provides: busybox-udeb
 Priority: standard
 Description: Tiny utilities for the debian-installer
  BusyBox combines tiny versions of many common UNIX utilities into a single