From 8fd8ea2db370b7a0ac9b9544642972d1b13b78ad Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Thu, 4 Jan 2007 14:16:47 +0100 Subject: [PATCH] Imported Debian patch 1.0.10-6~quilt.4 --- debian/changelog | 14 +++++++++++ debian/control | 2 +- debian/patches/09-manpage-paths-fixup.patch | 26 +++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 13 +++-------- 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 debian/patches/09-manpage-paths-fixup.patch diff --git a/debian/changelog b/debian/changelog index 1e35b6b..320f971 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +nfs-utils (1:1.0.10-6~quilt.4) experimental; urgency=low + + * 09-manpage-paths-fixup.patch: Fix up the paths to rpc.lockd and showmount + in the man pages; replaces the Perl one-liner we used to have in + debian/rules. + * Remove build-dependency on perl. + * Use $(CURDIR) instead of $(shell pwd) in debian/rules. + * Let build instead of build-stamp depend on patch; this makes sure we won't + be running configure and make every single time (since make sees that + "patch" does not exist, and thus thinks it needs to remake build-stamp). + + -- Steinar H. Gunderson Thu, 4 Jan 2007 14:16:47 +0100 + nfs-utils (1:1.0.10-6~quilt.3) experimental; urgency=low * Remove obsolete DEB_* variables from debian/rules. @@ -267,6 +280,7 @@ nfs-utils (1:1.0.9-1) unstable; urgency=high -- Anibal Monsalve Salazar Sat, 08 Jul 2006 14:26:40 +1000 + nfs-utils (1:1.0.8+1.0.9pre1-4) unstable; urgency=low * Back out having separate mount.nfs; this is in line with upstream, who diff --git a/debian/control b/debian/control index 147881f..dfd37ab 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: standard Section: net Maintainer: Anibal Monsalve Salazar Uploaders: Steinar H. Gunderson , Daniel Baumann -Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, perl, pkg-config, quilt +Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, pkg-config, quilt Build-Conflicts: librpcsecgss-dev (= 0.14-1) Standards-Version: 3.7.2 diff --git a/debian/patches/09-manpage-paths-fixup.patch b/debian/patches/09-manpage-paths-fixup.patch new file mode 100644 index 0000000..a2e0d30 --- /dev/null +++ b/debian/patches/09-manpage-paths-fixup.patch @@ -0,0 +1,26 @@ +Index: nfs-utils-1.0.10/utils/lockd/lockd.man +=================================================================== +--- nfs-utils-1.0.10.orig/utils/lockd/lockd.man ++++ nfs-utils-1.0.10/utils/lockd/lockd.man +@@ -7,7 +7,7 @@ + .SH NAME + rpc.lockd \- start kernel lockd process + .SH SYNOPSIS +-.B "/usr/sbin/rpc.lockd ++.B "/sbin/rpc.lockd + .SH DESCRIPTION + The + .B rpc.lockd +Index: nfs-utils-1.0.10/utils/showmount/showmount.man +=================================================================== +--- nfs-utils-1.0.10.orig/utils/showmount/showmount.man ++++ nfs-utils-1.0.10/utils/showmount/showmount.man +@@ -4,7 +4,7 @@ + .SH NAME + showmount \- show mount information for an NFS server + .SH SYNOPSIS +-.B /usr/sbin/showmount ++.B /sbin/showmount + .B "[\ \-adehv\ ]" + .B "[\ \-\-all\ ]" + .B "[\ \-\-directories\ ]" diff --git a/debian/patches/series b/debian/patches/series index 03b6c20..88e5ebe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 06-fix-no-tcp-short-option.patch 07-exports-default-options.patch 08-dont-build-getkversion.patch +09-manpage-paths-fixup.patch diff --git a/debian/rules b/debian/rules index 26168cf..197c3fc 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ include /usr/share/quilt/quilt.make # Temporary root -DEBTMP := $(shell pwd)/debian/tmp +DEBTMP := $(CURDIR)/debian/tmp -build: build-stamp -build-stamp: patch +build: build-stamp patch +build-stamp: dh_testdir CFLAGS="-g -O2 -Wall" ./configure \ --mandir='$${prefix}/share/man' \ @@ -32,13 +32,6 @@ binary-arch: build mkdir $(DEBTMP) $(MAKE) DESTDIR='$(DEBTMP)' install dh_install - - # Fix up the manpages - for f in lockd statd showmount; do \ - perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \ - debian/tmp/usr/share/man/man8/$$f.8; \ - done; - dh_installdocs -A dh_installdocs -pnfs-common debian/README.Debian.nfsv4 install -m 0755 debian/nfs-common.init debian/nfs-common/etc/init.d/nfs-common -- 2.39.5