Don't install fs man pages for Windows-only commands

* Don't install man pages for fs command variants that are only
  available on Windows.

diff --git a/debian/changelog b/debian/changelog
index c5228ef9a71c7c0ee57a4ef5992d332d220f9d4e..8b3b4a47d592ace3252cfd0c2223d93d287facce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ openafs (1.4.11~pre3+dfsg-1) UNRELEASED; urgency=low
     openafs-modules-dkms package.  In the possible cases where the tree
     may not be present to be removed, failing package removal doesn't
     make sense.  (Further addresses LP #368471.)
+  * Don't install man pages for fs command variants that are only
+    available on Windows.
   * Bring src/config/linux-version closer to upstream since upstream now
     handles unversioned source directories.  There is one remaining change
     required to search for UTS_RELEASE in the correct header path.

diff --git a/debian/openafs-client.install b/debian/openafs-client.install
index e44695aec5dab97c7c33ce1bb06ddf2a8fcc6d21..f50e8b51b2c91477f630cff31107156785cb989b 100644 (file)
--- a/debian/openafs-client.install
+++ b/debian/openafs-client.install
@@ -42,12 +42,10 @@ debian/tmp/usr/share/man/man1/fs_checkservers.1       usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_checkvolumes.1       usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_cleanacl.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_copyacl.1            usr/share/man/man1
-debian/tmp/usr/share/man/man1/fs_cscpolicy.1          usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_diskfree.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_examine.1            usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_exportafs.1          usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_flush.1              usr/share/man/man1
-debian/tmp/usr/share/man/man1/fs_flushall.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_flushmount.1         usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_flushvolume.1        usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_getcalleraccess.1    usr/share/man/man1
@@ -63,10 +61,8 @@ debian/tmp/usr/share/man/man1/fs_listaliases.1        usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_listcells.1          usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_listquota.1          usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_lsmount.1            usr/share/man/man1
-debian/tmp/usr/share/man/man1/fs_memdump.1            usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_messages.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_mkmount.1            usr/share/man/man1
-debian/tmp/usr/share/man/man1/fs_minidump.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_monitor.1            usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_newalias.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_newcell.1            usr/share/man/man1
@@ -85,7 +81,6 @@ debian/tmp/usr/share/man/man1/fs_setserverprefs.1     usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_setvol.1             usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_storebehind.1        usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_sysname.1            usr/share/man/man1
-debian/tmp/usr/share/man/man1/fs_trace.1              usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_uuid.1               usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_whereis.1            usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_whichcell.1          usr/share/man/man1

diff --git a/debian/rules b/debian/rules
index 77d2d408b07597642a97fb1d440a201e65b30245..4ea0c22d15e9c2f6b57949f906d8fdbfe9ba71b3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,8 @@ DOC_PACKAGES = libpam-openafs-kaserver openafs-dbserver openafs-fileserver \
 # These are files that we know we don't want to install.  List them so that we
 # can use dh_install --fail-missing and catch anything new that shows up.
 IGNORE = -XAuthLog -Xcompile_et -Xcopyauth -Xdlog -Xdpass -Xfms.log \
-       -Xkadb_check -Xkaserver -Xkdb -Xkdump -Xkpwvalid \
+       -Xfs_cscpolicy.1 -Xfs_flushall.1 -Xfs_memdump.1 -Xfs_minidump.1 \
+       -Xfs_trace.1 -Xkadb_check -Xkaserver -Xkdb -Xkdump -Xkpwvalid \
        -Xlibafssetpag.so -Xlibafsrpc.so -Xlibafsauthent.so -Xpackage \
        -Xpagsh.krb -Xrestorevol -Xsymlink -Xtokens.krb -Xuss \
        -Xvldb_convert -Xvsys -Xxfs_size_check