Added CONFIG_CLEAR and CONFIG_RESET to config.maemo

Added ncurses-bin to Provides/Replaces/Conflicts

diff --git a/debian/changelog b/debian/changelog
index a026660..d0f8804 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+busybox (3:1.10.2.legal-1osso16) unstable; urgency=low
+
+  * Added CONFIG_CLEAR and CONFIG_RESET to config.maemo
+  * Added ncurses-bin to Provides/Replaces/Conflicts. Fixes: NB#92440
+
+ -- Turo Janka <ext-turo.1.janka@nokia.com>  Thu, 12 Feb 2009 12:50:42 +0200
+
 busybox (3:1.10.2.legal-1osso15) unstable; urgency=low
 
   * Removed CONFIG_FEATURE_GUNZIP_UNCOMPRESS from config.maemo

diff --git a/debian/config/config.maemo b/debian/config/config.maemo
index e18f85a..b017b2a 100644 (file)
--- a/debian/config/config.maemo
+++ b/debian/config/config.maemo
@@ -270,14 +270,14 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 # Console Utilities
 #
 CONFIG_CHVT=y
-# CONFIG_CLEAR is not set
+CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
 # CONFIG_DUMPKMAP is not set
 CONFIG_KBD_MODE=y
 # CONFIG_LOADFONT is not set
 # CONFIG_LOADKMAP is not set
 CONFIG_OPENVT=y
-# CONFIG_RESET is not set
+CONFIG_RESET=y
 # CONFIG_RESIZE is not set
 # CONFIG_FEATURE_RESIZE_PRINT is not set
 # CONFIG_SETCONSOLE is not set

diff --git a/debian/control b/debian/control
index 720bfad..aa8d51b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,9 @@ Standards-Version: 3.7.3
 Package: busybox
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: busybox-static, findutils, gzip, hostname, ifupdown, net-tools, procps, sed, tar, coreutils, grep, mount, login, debianutils, util-linux, nawk, mawk, gawk, elvis-tiny, mktemp, bsdutils, sysvinit-utils, iputils-ping, psmisc, time
-Replaces: busybox-static, findutils, gzip, hostname, ifupdown, net-tools, procps, sed, tar, coreutils, grep, mount, login, debianutils, util-linux, mktemp, bsdutils, sysvinit-utils, dnsutils, iputils-ping, psmisc, time
-Provides: busybox-static, findutils, gzip, hostname, ifupdown, net-tools, procps, sed, tar, coreutils, grep, mount, login, debianutils, util-linux, vi, awk, nawk, mawk, gawk, mktemp, bsdutils, sysvinit-utils, iputils-ping, psmisc, time
+Conflicts: busybox-static, findutils, gzip, hostname, ifupdown, net-tools, procps, sed, tar, coreutils, grep, mount, login, debianutils, util-linux, nawk, mawk, gawk, elvis-tiny, mktemp, bsdutils, sysvinit-utils, iputils-ping, psmisc, time, ncurses-bin
+Replaces: busybox-static, findutils, gzip, hostname, ifupdown, net-tools, procps, sed, tar, coreutils, grep, mount, login, debianutils, util-linux, mktemp, bsdutils, sysvinit-utils, dnsutils, iputils-ping, psmisc, time, ncurses-bin
+Provides: busybox-static, findutils, gzip, hostname, ifupdown, net-tools, procps, sed, tar, coreutils, grep, mount, login, debianutils, util-linux, vi, awk, nawk, mawk, gawk, mktemp, bsdutils, sysvinit-utils, iputils-ping, psmisc, time, ncurses-bin
 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