From 37b7d8c5bbabbffc03a5fc638e09cbbf02671df1 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 27 Jun 2008 21:21:30 -0700 Subject: [PATCH] Rename the up man page to afs-up, matching our renaming Apply quilt patch afs-up-rename: Update the up man page to say afs-up instead, matching our renaming of the command, and rename it in the source tree so that the generated man page will have the correct name. Closes: #459635 --- debian/patches/afs-up-rename | 62 ----------------------- debian/rules | 3 +- doc/man-pages/pod1/{up.pod => afs-up.pod} | 12 ++--- 3 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 debian/patches/afs-up-rename rename doc/man-pages/pod1/{up.pod => afs-up.pod} (91%) diff --git a/debian/patches/afs-up-rename b/debian/patches/afs-up-rename deleted file mode 100644 index 8da84b5a9..000000000 --- a/debian/patches/afs-up-rename +++ /dev/null @@ -1,62 +0,0 @@ -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/rules b/debian/rules index e79fd5655..8ff0a4a76 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ DOC_PACKAGES = libpam-openafs-kaserver openafs-dbserver openafs-fileserver \ IGNORE = -XAuthLog -Xcompile_et -Xcopyauth -Xdlog -Xdpass -Xfms.log \ -Xkadb_check -Xkaserver -Xkdb -Xkdump -Xklog.krb -Xkpwvalid \ -Xlibafssetpag.so -Xlibafsrpc.so -Xlibafsauthent.so -Xpackage \ - -Xpagsh.krb -Xrestorevol -Xsymlink -Xtokens.krb -Xman1/up.1 -Xuss \ + -Xpagsh.krb -Xrestorevol -Xsymlink -Xtokens.krb -Xuss \ -Xvldb_convert -Xvsys -Xxfs_size_check # Installed via other means since we have to rename them. @@ -88,7 +88,6 @@ 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 \ diff --git a/doc/man-pages/pod1/up.pod b/doc/man-pages/pod1/afs-up.pod similarity index 91% rename from doc/man-pages/pod1/up.pod rename to doc/man-pages/pod1/afs-up.pod index adb09670c..ebcee4100 100644 --- a/doc/man-pages/pod1/up.pod +++ b/doc/man-pages/pod1/afs-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 @@ B [B<-v>] [B<-1>] [B<-f>] [B<-r>] [B<-x>] [B<-m>] =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 @@ than to the timestamp that the subdirectory has in the source directory. =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 @@ Names the directory to which to copy. It does not have to exist already. The following command copies the contents of the directory F to directory F: - % up dir1 dir2 + % afs-up dir1 dir2 =head1 PRIVILEGE REQUIRED -- 2.39.5