2000-12-03 Chip Salzenberg <chip@valinux.com>

	* support/nfs/xio.c (xfopen): Initialize x_line to one, not zero.
	* debian/control: Let nhfsstone replace files in nfs-kernel-server.
	* debian/changelog: Version 0.2.1-4.

diff --git a/ChangeLog b/ChangeLog
index ee92e7bde4cf516f59217914d87c175321a24d7e..9f178630503cc28edf562a2cbf8877c5f922eac1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2000-12-03  Chip Salzenberg  <chip@valinux.com>
 
        * support/nfs/xio.c (xfopen): Initialize x_line to one, not zero.
+       * debian/control: Let nhfsstone replace files in nfs-kernel-server.
+       * debian/changelog: Version 0.2.1-4.
 
 2000-11-27  Tobias Ringstrom <tori@tellus.mine.nu>
 

diff --git a/debian/changelog b/debian/changelog
index 80e9e07010d516f7b8914d9d801e33c2b29c9adc..05a4ace5b6bd658420ec54f8fd77a6fd5907992c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nfs-utils (1:0.2.1-4) unstable; urgency=medium
+
+  * Warn about common errors in /etc/exports.  (closes: #66421)
+  * Fix line numbers in messages about /etc/exports.  (closes: #59734)
+  * Let nhfsstone replace files from old server packages.  (closes: #59261)
+
+ -- Chip Salzenberg <chip@valinux.com>  Sun,  3 Dec 2000 14:41:13 -0800
+
 nfs-utils (1:0.2.1-3) unstable; urgency=low
 
   * Add portmap dependency. (closes: #75639)

diff --git a/debian/control b/debian/control
index 0bafacd57ffc8eef6020f8cae9032d1a3440c2fe..9de266d00ff3e93957c3222d9d374f7f09ed3e78 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Description: Kernel NFS server support
 Package: nhfsstone
 Architecture: any
 Depends: nfs-common, ${shlibs:Depends}
+Replaces: nfs-kernel-server
 Description: NFS benchmark program.
  .
  Upstream: SourceForge project "nfs", CVS module nfs-utils.