Sync with 20021214-1 debian package

4 files changed, 39 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 6d7625eee..2d030bce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+busybox-cvs (0.60.99.cvs20021214-1) unstable; urgency=low
+
+  * new cvs version
+    - udhcp merge.
+  * fix location of ip link.
+
+ -- Bastian Blank <waldi@debian.org>  Sat, 14 Dec 2002 13:52:15 +0100
+
+busybox-cvs (0.60.99.cvs20021210-1) unstable; urgency=low
+
+  * new cvs version
+    - various upstream fixes found in the last version.
+  * busybox-cvs-udeb
+    - include readlink and realpath.
+
+ -- Bastian Blank <waldi@debian.org>  Tue, 10 Dec 2002 21:23:40 +0100
+
 busybox-cvs (0.60.99.cvs20021209-2) unstable; urgency=low
 
   * cleanup scripts/config/ within make clean (closes: #172413)
@@ -29,13 +46,6 @@ busybox-cvs (0.60.99.cvs20021203-1) unstable; urgency=low
 
  -- Bastian Blank <waldi@debian.org>  Tue, 03 Dec 2002 18:51:00 +0100
 
-busybox-cvs (0.61.pre-custom1) unstable; urgency=low
-
-  * This is just to make it easier to make custom debs
-  * Replace this changelog before makeing offical debs
-
- -- Bastian Blank <waldi@debian.org>  Sun, 01 Dec 2002 02:02:46 +0100
-
 busybox (1:0.60.0-1) unstable; urgency=low
 
   * New version released.  See changelog for details.
diff --git a/debian/config-deb b/debian/config-deb
index bb71c1aa6..f44784464 100644
--- a/debian/config-deb
+++ b/debian/config-deb
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+HAVE_DOT_CONFIG=y
 
 #
 # General Configuration
@@ -37,6 +38,7 @@ CONFIG_GUNZIP=y
 # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
 CONFIG_GZIP=y
 # CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 # CONFIG_FEATURE_TAR_BZIP2 is not set
@@ -189,6 +191,8 @@ CONFIG_REBOOT=y
 # Networking Utilities
 #
 # CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
 CONFIG_HOSTNAME=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -203,6 +207,7 @@ CONFIG_FEATURE_IFCONFIG_HW=y
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
 # CONFIG_NC is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
@@ -236,7 +241,7 @@ CONFIG_PS=y
 CONFIG_UPTIME=y
 
 #
-# Bourne Shell
+# Another Bourne-like Shell
 #
 # CONFIG_FEATURE_SH_IS_ASH is not set
 # CONFIG_FEATURE_SH_IS_HUSH is not set
@@ -265,6 +270,7 @@ CONFIG_ID=y
 # CONFIG_LOGNAME is not set
 # CONFIG_PRINTF is not set
 CONFIG_PWD=y
+# CONFIG_REALPATH is not set
 CONFIG_SLEEP=y
 # CONFIG_STTY is not set
 # CONFIG_TEE is not set
diff --git a/debian/config-static b/debian/config-static
index f910569aa..2660761b7 100644
--- a/debian/config-static
+++ b/debian/config-static
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+HAVE_DOT_CONFIG=y
 
 #
 # General Configuration
@@ -40,6 +41,7 @@ CONFIG_GUNZIP=y
 CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
 CONFIG_GZIP=y
 CONFIG_RPM2CPIO=y
+# CONFIG_RPM is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
@@ -206,6 +208,8 @@ CONFIG_WATCHDOG=y
 # Networking Utilities
 #
 CONFIG_FEATURE_IPV6=y
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
 CONFIG_HOSTNAME=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -229,6 +233,7 @@ CONFIG_FEATURE_IPCALC_FANCY=y
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
 CONFIG_NC=y
 CONFIG_NETSTAT=y
 CONFIG_NSLOOKUP=y
@@ -260,7 +265,6 @@ CONFIG_UDHCPC=y
 CONFIG_DUMPLEASES=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 CONFIG_FEATURE_UDHCP_DEBUG=y
-CONFIG_FEATURE_UDHCPC_IP=y
 
 #
 # Process Utilities
@@ -276,7 +280,7 @@ FEATURE_CPU_USAGE_PERCENTAGE=y
 CONFIG_UPTIME=y
 
 #
-# Bourne Shell
+# Another Bourne-like Shell
 #
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
@@ -299,7 +303,6 @@ CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
 CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
@@ -308,6 +311,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # Bourne Shell Options
 #
 CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
 CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y
 CONFIG_FEATURE_COMMAND_HISTORY=15
@@ -338,6 +342,7 @@ CONFIG_ID=y
 CONFIG_LOGNAME=y
 CONFIG_PRINTF=y
 CONFIG_PWD=y
+# CONFIG_REALPATH is not set
 CONFIG_SLEEP=y
 CONFIG_STTY=y
 CONFIG_TEE=y
diff --git a/debian/config-udeb b/debian/config-udeb
index 4d2f5b80a..2f5917053 100644
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+HAVE_DOT_CONFIG=y
 
 #
 # General Configuration
@@ -37,6 +38,7 @@ CONFIG_GUNZIP=y
 # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
 # CONFIG_GZIP is not set
 # CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
 CONFIG_TAR=y
 # CONFIG_FEATURE_TAR_CREATE is not set
 # CONFIG_FEATURE_TAR_BZIP2 is not set
@@ -189,6 +191,8 @@ CONFIG_REBOOT=y
 # Networking Utilities
 #
 # CONFIG_FEATURE_IPV6 is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
 # CONFIG_HOSTNAME is not set
 # CONFIG_IFCONFIG is not set
 # CONFIG_IFUPDOWN is not set
@@ -202,6 +206,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
 # CONFIG_NC is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
@@ -224,7 +229,6 @@ CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
-CONFIG_FEATURE_UDHCPC_IP=y
 
 #
 # Process Utilities
@@ -239,7 +243,7 @@ CONFIG_PS=y
 # CONFIG_UPTIME is not set
 
 #
-# Bourne Shell
+# Another Bourne-like Shell
 #
 # CONFIG_FEATURE_SH_IS_ASH is not set
 # CONFIG_FEATURE_SH_IS_HUSH is not set
@@ -268,6 +272,7 @@ CONFIG_ID=y
 # CONFIG_LOGNAME is not set
 # CONFIG_PRINTF is not set
 CONFIG_PWD=y
+CONFIG_REALPATH=y
 # CONFIG_SLEEP is not set
 # CONFIG_STTY is not set
 # CONFIG_TEE is not set