2001-02-26 Chip Salzenberg <chip@valinux.com>

	* debian/changelog: Version 0.3.1-1.
	* Mention upstream source and license in copyright file.
	* Add build-Depends for debhelper and libwrap0-dev.

diff --git a/ChangeLog b/ChangeLog
index 6ca1921dc83edfe49f5b11a801de38a40003fada..66f73b8ea6e81715e66791c2facb0479c9fc73f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-26  Chip Salzenberg  <chip@valinux.com>
+
+       * debian/changelog: Version 0.3.1-1.
+       * Mention upstream source and license in copyright file.
+       * Add build-Depends for debhelper and libwrap0-dev.
+

 2001-02-20  Lon Hohberger <hohberger@missioncriticallinux.com>
 
        * etc/nodist/nfs-server: Changed chkconfig line to 60 20
 2001-02-20  Lon Hohberger <hohberger@missioncriticallinux.com>
 
        * etc/nodist/nfs-server: Changed chkconfig line to 60 20


@@ -22,7 +28,7 @@
 
        * configure.in (VERSION): Set to "0.3.1".
        * configure: Regenerated.
 
        * configure.in (VERSION): Set to "0.3.1".
        * configure: Regenerated.

-       * nfs-utils.spec: Likewise.
+o      * nfs-utils.spec: Likewise.

 
        * README: Updated for 0.3.1.
 
 
        * README: Updated for 0.3.1.
 

diff --git a/debian/changelog b/debian/changelog
index 6a5f58eb12109650d79731b67242a4c21df04dc9..0ee769efad90fd54de7d558b16d7d9acb0cf9ab8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nfs-utils (1:0.3.1-1) unstable; urgency=medium
+
+  * New upstream version.
+  * Incorporate (but not all) Bug Party changes by David LaBissoniere
+    <labiss@usit.net>:
+    > Mention upstream source and license in copyright file.  (closes: #79997)
+    > Add Build-Depends for debhelper and libwrap0-dev.  (closes: #84131)
+
+ -- Chip Salzenberg <chip@debian.org>  Mon, 26 Feb 2001 16:51:15 -0800
+

 nfs-utils (1:0.3-2) unstable; urgency=low
 
   * Upstream:
 nfs-utils (1:0.3-2) unstable; urgency=low
 
   * Upstream:

diff --git a/debian/control b/debian/control
index a0d6c303942e5e917dcda0fb58b1dcb6d02e96e0..c1088351e59ea50a40fb01631fb0ce9b89a9fcfe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: nfs-utils
 Priority: standard
 Section: net
 Maintainer: Chip Salzenberg <chip@debian.org>
 Priority: standard
 Section: net
 Maintainer: Chip Salzenberg <chip@debian.org>

+Build-Depends: debhelper, libwrap0-dev

 Standards-Version: 3.1.1.1
 
 Package: nfs-kernel-server
 Standards-Version: 3.1.1.1
 
 Package: nfs-kernel-server

diff --git a/debian/copyright b/debian/copyright
index 2d75428ba1435445d00fd139c6d7eb02a1e641ba..7dd1c082bae4fe5a8c0fbcc2d6721cfffcd25157 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1 +1,11 @@
-The copyright of this package is GPL, version 2 or later.
+This package was debianized by Chip Salzenberg <chip@debian.org> on Fri,  3 Dec 1999 20:00:00 -0800
+
+It was downloaded from http://sourceforge.net/projects/nfs/
+
+View individual source files for respective authors.
+
+
+You are free to distribute this software under the terms of
+the GNU General Public License, version 2 or later.
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file /usr/share/common-licenses/GPL.

diff --git a/debian/rules b/debian/rules
index 9f46a9c3ebeb4883f97b842a3e65a68694d79b37..58eb43abf692e1876afa6a044213a8f52a9880cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,10 @@ binary-arch: build
        dh_movefiles
        # Fixups Start Here #
        cd debian && \
        dh_movefiles
        # Fixups Start Here #
        cd debian && \

-         for f in rpc.lockd rpc.statd showmount; do \
-           mv tmp/usr/sbin/$$f nfs-common/sbin/$$f; \
+         for f in lockd statd showmount; do \
+           mv tmp/usr/sbin/*$$f nfs-common/sbin; \
+           perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
+               nfs-common/usr/share/man/man8/$$f.8; \

          done; \
          rm -f tmp/usr/sbin/*quota*; \
          rm -f tmp/usr/share/man/man8/*quota*; \
          done; \
          rm -f tmp/usr/sbin/*quota*; \
          rm -f tmp/usr/share/man/man8/*quota*; \