6 files changed, 27 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 032e21663..232a17d38 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 #
 
 PROG      := busybox
-VERSION   := 0.45
+VERSION   := 0.46
 BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z")
 export VERSION
 
diff --git a/busybox.spec b/busybox.spec
index a7eb86dc1..ee92610d0 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,5 +1,5 @@
 Name: busybox
-Version: 0.45
+Version: 0.46
 Release: 1
 Group: System/Utilities
 Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.
diff --git a/debian/changelog b/debian/changelog
index 0dbc36b60..1a249858d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+busybox (0.46-1) unstable; urgency=low
+
+  * New version released.  See changelog for details.
+
+ -- Erik Andersen <andersee@debian.org>  Tue, 11 Jul 2000 12:15:44 -0600
+
 busybox (0.45-1) unstable; urgency=low
 
   * First attempt at packaging BusyBox as a .deb.  This has been in 
diff --git a/debian/control b/debian/control
index 78dd104e0..bbbf86e09 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Package: busybox
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: binutils, bsdutils, console-tools, cpio, debianutils, dnsutils, dpkg, fbset, fdflush, fileutils, grep, gzip, hostname, modutils, mount, netbase, procps, psmisc, sed, sharutils, shellutils, sysklogd, sysvinit, tar, textutils, update, util-linux
-Replaces: dpkg, netbase
+Replaces: netbase
 Section: utils
 Description: Tiny utilities for the debian-installer and for embedded systems. 
  BusyBox combines tiny versions of many common UNIX utilities into a single
@@ -20,9 +20,9 @@ Description: Tiny utilities for the debian-installer and for embedded systems.
  counterparts.
  .
  BusyBox is used by the debian-installer.  Installing BusyBox onto your Debian
- system is not recommended, unless you are intended to make a very small embedded
- system.  Chances are good that for embedded systems, you will want to recompile
- to only include the tools and utilities you wish to include.
+ system is not recommended, unless you are intended to make a very small
+ embedded system.  Chances are good that for embedded systems, you will want to
+ recompile to only include the tools and utilities you wish to include.
 
 Package: busybox-static
 Architecture: any
diff --git a/docs/busybox.net/index.html b/docs/busybox.net/index.html
index 55215a7c0..ff6d6f530 100644
--- a/docs/busybox.net/index.html
+++ b/docs/busybox.net/index.html
@@ -76,6 +76,17 @@ To subscribe, go and visit <a href="http://opensource.lineo.com/mailman/listinfo
 
 <ul>
 
+    <p> <li> <b>11 July 2000 -- BusyBox 0.46 released</b>
+    <br>
+
+             This release fixes several bugs (including a ugly bug in tar,
+             and fixes for NFSv3 mount support).  Added a dumpkmap to allow 
+             people to dump a binary keymaps for use with 'loadkmap', and a
+             completely reworked 'grep' and 'sed' with should behave better.
+             BusyBox shell can now also be used as a login shell.
+             See the <a href="ftp://ftp.lineo.com/pub/busybox/Changelog">changelog</a> for complete details.
+
+
     <p> <li> <b>21 June 2000 -- BusyBox 0.45 released</b>
     <br>
 
@@ -149,7 +160,9 @@ Current documentation for BusyBox includes:
                 fairly comprehensive for the BusyBox 0.43 release.  If you find any 
                 errors (factual, grammatical, whatever) please let me know.
     <li> <a href="http://bugs.lineo.com/db/pa/lbusybox.html">BusyBoxBugs</a>.
-    <li> More documentation will follow.
+    <li> If you need more help, the BusyBox
+    <a href="http://opensource.lineo.com/lists/busybox/">mailing list</a> is
+    a good place to start.
 </ul>
 
 
diff --git a/examples/busybox.spec b/examples/busybox.spec
index a7eb86dc1..ee92610d0 100644
--- a/examples/busybox.spec
+++ b/examples/busybox.spec
@@ -1,5 +1,5 @@
 Name: busybox
-Version: 0.45
+Version: 0.46
 Release: 1
 Group: System/Utilities
 Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.