* Install more of the standard OpenAFS utilities. (Closes: #138851)

    - openafs-dbserver: Install prdb_check and vldb_check.
    - openafs-fileserver: Install voldump.
    - openafs-client: Install fstrace, scout, and up (as afs-up).
  * Do not install kpwvalid.  The default version does little useful and
    the kpwvalid binary must be in AFS for it to take effect.

Also remove an old rm from debian/rules that no longer does anything.

diff --git a/debian/changelog b/debian/changelog
index e3e1d433f737485062962ed53a0b8f32f2297e4e..a3daa787aaa31f8ea0c745e6a8f91161ca34e978 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 openafs (1.4.0-2) unstable; urgency=low
 
+  * Install more of the standard OpenAFS utilities.  (Closes: #138851)
+    - openafs-dbserver: Install prdb_check and vldb_check.
+    - openafs-fileserver: Install voldump.
+    - openafs-client: Install fstrace, scout, and up (as afs-up).
+  * Do not install kpwvalid.  The default version does little useful and
+    the kpwvalid binary must be in AFS for it to take effect.
   * Overhaul the way kernel modules are built.
     - Recommend linux-image rather than kernel-image for newer kernels.
     - Always recommend the kernel package; since it's only a recommends,
@@ -12,7 +18,7 @@ openafs (1.4.0-2) unstable; urgency=low
   * Suggest the same PAM settings for pam_krb5 that libpam-krb5 does.
   * Update uploader address.
 
- -- Russ Allbery <rra@debian.org>  Tue,  6 Dec 2005 13:20:05 -0800
+ --
 
 openafs (1.4.0-1) unstable; urgency=low
 

diff --git a/debian/openafs-client.install b/debian/openafs-client.install
index ae08ea2b39ccaed0874bf2ebf5d6279f27a48d5f..376df22bfbb1270b86bde747847af3ed9c460ed4 100644 (file)
--- a/debian/openafs-client.install
+++ b/debian/openafs-client.install
@@ -2,14 +2,15 @@ dest/bin/bos                            usr/bin
 dest/bin/cmdebug                        usr/bin
 dest/bin/fs                             usr/bin
 dest/bin/klog                           usr/bin
-dest/bin/kpwvalid                       usr/bin
 dest/bin/pagsh                          usr/bin
 dest/bin/pts                            usr/bin
+dest/bin/scout                          usr/bin
 dest/bin/sys                            usr/bin
 dest/bin/tokens                         usr/bin
 dest/bin/translate_et                   usr/bin
 dest/bin/udebug                         usr/bin
 dest/bin/unlog                          usr/bin
+dest/bin/up                             usr/bin
 
 dest/etc/rxdebug                        usr/bin
 dest/etc/vos                            usr/bin
@@ -17,5 +18,6 @@ dest/etc/vos                            usr/bin
 dest/etc/backup                         usr/sbin
 dest/etc/butc                           usr/sbin
 dest/etc/fms                            usr/sbin
+dest/etc/fstrace                        usr/sbin
 
 dest/root.client/usr/vice/etc/afsd      sbin

diff --git a/debian/openafs-dbserver.install b/debian/openafs-dbserver.install
index fb0e64bd7fbef8df619490722a355c1d4dddfefe..c6e4e1a009d99a6776950f22261e378df6f3d56a 100644 (file)
--- a/debian/openafs-dbserver.install
+++ b/debian/openafs-dbserver.install
@@ -1,4 +1,8 @@
+dest/etc/prdb_check                     usr/sbin
+dest/etc/vldb_check                     usr/sbin
+
 dest/root.server/usr/afs/bin/pt_util    usr/sbin
+
 dest/root.server/usr/afs/bin/buserver   usr/lib/openafs
 dest/root.server/usr/afs/bin/ptserver   usr/lib/openafs
 dest/root.server/usr/afs/bin/vlserver   usr/lib/openafs

diff --git a/debian/openafs-fileserver.install b/debian/openafs-fileserver.install
index 1cf5862fdacaf72d41f9c6930db24f4887ecbc4e..fa6656e05052ac6137c5777ecb99b49d8909c86d 100644 (file)
--- a/debian/openafs-fileserver.install
+++ b/debian/openafs-fileserver.install
@@ -1,5 +1,8 @@
+dest/etc/voldump                        usr/sbin
+
 dest/root.server/usr/afs/bin/bosserver  usr/sbin
 dest/root.server/usr/afs/bin/up*        usr/sbin
+
 dest/root.server/usr/afs/bin/fileserver usr/lib/openafs
 dest/root.server/usr/afs/bin/salvager   usr/lib/openafs
 dest/root.server/usr/afs/bin/volserver  usr/lib/openafs

diff --git a/debian/rules b/debian/rules
index b0bd6e095c1518523ac881e3cb46d6568a9d46a4..bba231f1d1815107cddf44ccbbd34885a4689f88 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -88,7 +88,6 @@ build: configure-stamp build-stamp
 build-stamp:
        dh_testdir
        $(MAKE) dest_nolibafs
-       -rm $(SYS_NAME)/dest/include/crypt.h
        touch build-stamp
 
 clean:
@@ -118,6 +117,8 @@ install: build
        done
        mv debian/openafs-client/usr/bin/pagsh \
            debian/openafs-client/usr/bin/pagsh.openafs
+       mv debian/openafs-client/usr/bin/up \
+           debian/openafs-client/usr/bin/afs-up
        install -m 644 -c dest/lib/pam_afs.so.1 \
            debian/libpam-openafs-kaserver/lib/security/pam_afs.so
        install -m 644 -c dest/lib/pam_afs.krb.so.1 \