Give openafs-dbserver its own doc directory

* Give openafs-dbserver its own documentation directory rather than
  linking it to openafs-client, allowing relaxation of the versioned
  dependency on openafs-client to Recommends.  (However, openafs-client
  will still have to be installed for the openafs-fileserver init
  script, which uses the bos binary, so will still be pulled in by
  dependencies.)

diff --git a/debian/changelog b/debian/changelog
index 75726ffbb424273c3155723ef62e2e857bb5ed99..c81e157b2063cfdc8f6cb4f56c9f2be6b8b8726c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,12 @@ openafs (1.6.3-1) UNRELEASED; urgency=low
     - Do not discard the persistent client disk cache on restart.
     - Fix bugs that made it impossible to unmount a disk cache file system
       after it had been used by the client.
+  * Give openafs-dbserver its own documentation directory rather than
+    linking it to openafs-client, allowing relaxation of the versioned
+    dependency on openafs-client to Recommends.  (However, openafs-client
+    will still have to be installed for the openafs-fileserver init
+    script, which uses the bos binary, so will still be pulled in by
+    dependencies.)
 
  -- Russ Allbery <rra@debian.org>  Mon, 17 Jun 2013 10:50:14 -0700
 

diff --git a/debian/control b/debian/control
index 537d9cf01724b1de923eba274ee3f6181fd2fac7..48638724b931d6298f847c5b812ee20dace39be4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,7 @@ Description: AFS distributed filesystem old password changing
 
 Package: openafs-fileserver
 Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client, lsb-base
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, openafs-client
 Recommends: ntp | time-daemon
 Suggests: openafs-doc
 Description: AFS distributed filesystem file server
@@ -78,7 +78,8 @@ Description: AFS distributed filesystem file server
 Package: openafs-dbserver
 Architecture: alpha amd64 arm armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends},
- openafs-fileserver, openafs-client (= ${binary:Version})
+ openafs-fileserver
+Recommends: openafs-client
 Suggests: openafs-doc
 Description: AFS distributed filesystem database server
  AFS is a distributed filesystem allowing cross-platform sharing of

diff --git a/debian/openafs-dbserver.preinst b/debian/openafs-dbserver.preinst
new file mode 100755 (executable)
index 0000000..ba10f98
--- /dev/null
+++ b/debian/openafs-dbserver.preinst
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+# In version 1.6.3-1, we switched from symlinking the doc directory to
+# openafs-client to having our own doc directory so that we could weaken the
+# versioned dependency.  dpkg doesn't remove symlinks on upgrade, so we need
+# to remove the symlink in preinst to avoid overwriting the old files.
+if [ "$1" = 'upgrade' ] && dpkg --compare-versions "$2" lt 1.6.3 ; then
+    if [ -L '/usr/share/doc/openafs-dbserver' ] ; then
+        rm /usr/share/doc/openafs-dbserver
+    fi
+fi
+
+#DEBHELPER#

diff --git a/debian/rules b/debian/rules
index df6dad05ef115cf0fa98d06e743d7647d5c2a3a2..71097a7a4fbbe5ac85ccff9026c439527a866037 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,8 +48,7 @@ HTML_XSL   = /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
 # /usr/share/doc/openafs-client.  Any package on this list must depend on
 # openafs-client.  This variable is used as options to dh_installdocs with
 # the --link-doc option.
-DOC_PACKAGES = -plibpam-openafs-kaserver -popenafs-dbserver -popenafs-fuse \
-       -popenafs-kpasswd
+DOC_PACKAGES = -plibpam-openafs-kaserver -popenafs-fuse -popenafs-kpasswd
 
 # 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.