From fbd748b7913d72ff56ab46555c069afffe55b652 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 26 Mar 2008 23:29:07 +0000 Subject: [PATCH] * Install the up man page as afs-up, matching our renaming, and update its text accordingly. (Closes: #459635) --- debian/changelog | 2 ++ debian/openafs-client.install | 2 +- debian/patches/afs-up-rename | 62 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 ++- 5 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 debian/patches/afs-up-rename diff --git a/debian/changelog b/debian/changelog index 5513c6ef1..c03c05888 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ openafs (1.4.7~pre1.dfsg1-1) UNRELEASED; urgency=low - Potential deadlock fixed in the fileserver. - Better fileserver host tracking. - Ubik fixes preventing database truncation on unreliable links. + * Install the up man page as afs-up, matching our renaming, and update + its text accordingly. (Closes: #459635) * Update doc-base control file sections for the new categorization. * debian/rules and debian/module/rules improvements: - Remove all modified generated files on debian/rules clean. diff --git a/debian/openafs-client.install b/debian/openafs-client.install index 4d4a0684d..0561b6a6a 100644 --- a/debian/openafs-client.install +++ b/debian/openafs-client.install @@ -33,6 +33,7 @@ src/afs/afszcm.cat usr/share/openafs debian/CellServDB usr/share/openafs debian/tmp/usr/share/man/man1/afs.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/afs-up.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/afsmonitor.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/cmdebug.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs.1 usr/share/man/man1 @@ -100,7 +101,6 @@ debian/tmp/usr/share/man/man1/tokens.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/translate_et.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/udebug.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/unlog.1 usr/share/man/man1 -debian/tmp/usr/share/man/man1/up.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_addsite.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_apropos.1 usr/share/man/man1 diff --git a/debian/patches/afs-up-rename b/debian/patches/afs-up-rename new file mode 100644 index 000000000..8da84b5a9 --- /dev/null +++ b/debian/patches/afs-up-rename @@ -0,0 +1,62 @@ +Update the up man page to say afs-up instead, matching our renaming of +the command. We also have to copy up.pod to afs-up.pod to get the right +man page headers, but quilt can't do that easily, so we do that in +debian/rules. + +Not suitable upstream unless they rename the up command as well. + +Debian Bug#459635 + +--- openafs.orig/doc/man-pages/pod1/up.pod ++++ openafs/doc/man-pages/pod1/up.pod +@@ -1,13 +1,13 @@ + =head1 NAME + +-up - Recursively copy directories, preserving AFS metadata ++afs-up - Recursively copy directories, preserving AFS metadata + + =head1 SYNOPSIS + + =for html +
+ +-B [B<-v>] [B<-1>] [B<-f>] [B<-r>] [B<-x>] [B<-m>] ++B [B<-v>] [B<-1>] [B<-f>] [B<-r>] [B<-x>] [B<-m>] + > > + + =for html +@@ -15,7 +15,7 @@ + + =head1 DESCRIPTION + +-The B command recursively copies the files and subdirectories in a ++The B command recursively copies the files and subdirectories in a + specified source directory to a specified destination directory. The + command interpreter changes the destination directory and the files and + subdirectories in it in the following ways: +@@ -56,14 +56,14 @@ + + =back + +-The up command is idempotent, meaning that if its execution is interrupted ++The B command is idempotent, meaning that if its execution is interrupted + by a network, server machine, or process outage, then a subsequent reissue + of the same command continues from the interruption point, rather than + starting over at the beginning. This saves time and reduces network + traffic in comparison to the UNIX commands that provide similar + functionality. + +-The B command returns a status code of C<0> (zero) only if it ++The B command returns a status code of C<0> (zero) only if it + succeeds. Otherwise, it returns a status code of C<1> (one). + + This command does not use the syntax conventions of the AFS command +@@ -124,7 +124,7 @@ + The following command copies the contents of the directory F to + directory F: + +- % up dir1 dir2 ++ % afs-up dir1 dir2 + + =head1 PRIVILEGE REQUIRED + diff --git a/debian/patches/series b/debian/patches/series index 0033a68e5..74c1d0969 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ dfsg +afs-up-rename paths fstrace-paths module-name diff --git a/debian/rules b/debian/rules index 07c46e13f..9ad27da95 100755 --- a/debian/rules +++ b/debian/rules @@ -74,6 +74,7 @@ configure: configure-stamp configure-stamp: $(QUILT_STAMPFN) @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi dh_testdir + cp doc/man-pages/pod1/up.pod doc/man-pages/pod1/afs-up.pod sh regen.sh afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \ sh configure \ @@ -105,7 +106,8 @@ clean: unpatch [ ! -f Makefile ] || $(MAKE) distclean dh_clean aclocal.m4 configure configure-libafs doc/man-pages/man1/*.1 \ doc/man-pages/man5/*.5 doc/man-pages/man8/*.8 \ - src/kauth/ka-forwarder src/packaging/RedHat/openafs.spec + src/kauth/ka-forwarder src/packaging/RedHat/openafs.spec \ + doc/man-pages/pod1/afs-up.pod install: install-stamp install-stamp: DH_OPTIONS= -- 2.39.5