diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ad37afe06..d9e05684a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ busybox (0.50pre-1) unstable; urgency=low * init compiles with DEBUG_INIT enabled (closes: #85794) * md5sum no longer displays filename when reading stdin (closes: #81283) * lsmod, rmmod, and insmod are no longer enabled (closes: #85642) + * busybox and buxybox-static now conflict/replace each other (closes: #80421) * Not yet released. * See changelog for details. diff --git a/debian/control b/debian/control index 23223a9a9..48aac821e 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.2.1.0 Package: busybox Architecture: any Depends: ${shlibs:Depends} -Conflicts: -Replaces: +Conflicts: busybox-static +Replaces: busybox-static Section: utils Description: Tiny utilities for small and embedded systems. BusyBox combines tiny versions of many common UNIX utilities into a single @@ -27,6 +27,8 @@ Description: Tiny utilities for small and embedded systems. Package: busybox-static Architecture: any Depends: ${shlibs:Depends} +Conflicts: busybox +Replaces: busybox Section: shells Description: Provides a stand alone rescue shell with tons of builtin utilities. BusyBox combines tiny versions of many common UNIX utilities into a single |