* Install the up man page as afs-up, matching our renaming, and update

  its text accordingly.  (Closes: #459635)

diff --git a/debian/changelog b/debian/changelog
index 5513c6ef136f48fef7038d9ef78b8952518b15a7..c03c0588878d7fdd39b3dba816248ba3d081ea27 100644 (file)
--- 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 4d4a0684d7a26092fd0f0c71c59af1ecb2bc7483..0561b6a6a49414b4d7cc9a19db556985873e4654 100644 (file)
--- 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 (file)
index 0000000..8da84b5
--- /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
+ <div class="synopsis">
+ 
+-B<up> [B<-v>] [B<-1>] [B<-f>] [B<-r>] [B<-x>] [B<-m>]
++B<afs-up> [B<-v>] [B<-1>] [B<-f>] [B<-r>] [B<-x>] [B<-m>]
+     <I<source directory>> <I<destination directory>>
+ 
+ =for html
+@@ -15,7 +15,7 @@
+ 
+ =head1 DESCRIPTION
+ 
+-The B<up> command recursively copies the files and subdirectories in a
++The B<afs-up> 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<afs-up> 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<up> command returns a status code of C<0> (zero) only if it
++The B<afs-up> 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<dir1> to
+ directory F<dir2>:
+ 
+-   % up dir1 dir2
++   % afs-up dir1 dir2
+ 
+ =head1 PRIVILEGE REQUIRED
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 0033a68e54580c23be82e1331adfef0a49aab257..74c1d0969ac395cdb68e849a861dd8a235dfc0f3 100644 (file)
--- 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 07c46e13fd738ed2e0113888faf111e135d2c0b7..9ad27da95c5785ba60cd13a4d093f2850fdb1a98 100755 (executable)
--- 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=