Update openafs-client directives for 1.8.0

klog and knfs are gone, so don't install them and don't
update alternatives to point to them.  We have to remove
the klog.afs alternative from the 1.8 preinst since the
1.6 prerm will not do so for upgrades.

Several new man pages.

diff --git a/debian/openafs-client.install b/debian/openafs-client.install
index c3cff8b6979a2f022613d8659fa38e4846c0bef5..013451d01fdae1e319c4d8d680fed707dfdae544 100644 (file)
--- a/debian/openafs-client.install
+++ b/debian/openafs-client.install
@@ -5,8 +5,6 @@ debian/tmp/usr/bin/afsmonitor           usr/bin
 debian/tmp/usr/bin/bos                  usr/bin
 debian/tmp/usr/bin/cmdebug              usr/bin
 debian/tmp/usr/bin/fs                   usr/bin
-debian/tmp/usr/bin/klog                 usr/bin
-debian/tmp/usr/bin/knfs                 usr/bin
 debian/tmp/usr/bin/livesys              usr/bin
 debian/tmp/usr/bin/pagsh                usr/bin
 debian/tmp/usr/bin/pts                  usr/bin
@@ -48,6 +46,7 @@ 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_discon.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
@@ -61,6 +60,7 @@ debian/tmp/usr/share/man/man1/fs_getfid.1             usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_getclientaddrs.1     usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_getcrypt.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_getserverprefs.1     usr/share/man/man1
+debian/tmp/usr/share/man/man1/fs_getverify.1          usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_help.1               usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_listacl.1            usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_listaliases.1        usr/share/man/man1
@@ -72,6 +72,8 @@ debian/tmp/usr/share/man/man1/fs_mkmount.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
+debian/tmp/usr/share/man/man1/fs_nukenfscreds.1       usr/share/man/man1
+debian/tmp/usr/share/man/man1/fs_precache.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_quota.1              usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_rmmount.1            usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_rxstatpeer.1         usr/share/man/man1
@@ -84,6 +86,7 @@ debian/tmp/usr/share/man/man1/fs_setclientaddrs.1     usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_setcrypt.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_setquota.1           usr/share/man/man1
 debian/tmp/usr/share/man/man1/fs_setserverprefs.1     usr/share/man/man1
+debian/tmp/usr/share/man/man1/fs_setverify.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
@@ -91,8 +94,6 @@ 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
 debian/tmp/usr/share/man/man1/fs_wscell.1             usr/share/man/man1
-debian/tmp/usr/share/man/man1/klog.1                  usr/share/man/man1
-debian/tmp/usr/share/man/man1/knfs.1                  usr/share/man/man1
 debian/tmp/usr/share/man/man1/livesys.1               usr/share/man/man1
 debian/tmp/usr/share/man/man1/pagsh.1                 usr/share/man/man1
 debian/tmp/usr/share/man/man1/pts.1                   usr/share/man/man1

diff --git a/debian/openafs-client.postinst b/debian/openafs-client.postinst
index 6442eeea7c8d37caed9cb3dc40bcf13cb1878019..40253713b5cae8b6b3b64c035fe696fe5a04d7e7 100755 (executable)
--- a/debian/openafs-client.postinst
+++ b/debian/openafs-client.postinst
@@ -14,10 +14,6 @@ update-alternatives --install /usr/bin/pagsh pagsh \
     /usr/bin/pagsh.openafs 100  \
     --slave /usr/share/man/man1/pagsh.1.gz pagsh.1.gz \
     /usr/share/man/man1/pagsh.openafs.1.gz
-update-alternatives --install /usr/bin/klog klog \
-    /usr/bin/klog.afs 10 \
-    --slave /usr/share/man/man1/klog.1.gz klog.1.gz \
-    /usr/share/man/man1/klog.afs.1.gz
 
 # Set the local cell.  If ThisCell already exists, the config script will have
 # set the debconf database parameter accordingly.

diff --git a/debian/openafs-client.preinst b/debian/openafs-client.preinst
new file mode 100755 (executable)
index 0000000..075a1c2
--- /dev/null
+++ b/debian/openafs-client.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "1.8.0~"
+    update-alternatives --remove klog /usr/bin/klog.afs
+fi
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/openafs-client.prerm b/debian/openafs-client.prerm
index 02a1bebcedbbb578779f8ab114a49ba7a69be638..fb8b2d84e746e5373a9709f0556a663bf2104677 100755 (executable)
--- a/debian/openafs-client.prerm
+++ b/debian/openafs-client.prerm
@@ -4,7 +4,6 @@ set -e
 
 if [ "$1" = remove ] || [ "$1" = deconfigure ] ; then
     update-alternatives --remove pagsh /usr/bin/pagsh.openafs
-    update-alternatives --remove klog /usr/bin/klog.afs
 fi
 
 #DEBHELPER#