Tighten /usr/share/doc symlink dependencies, install NEWS

* Tighten the dependencies on openafs-client in packages that symlink
  their /usr/share/doc directories to openafs-client's to meet the
  Policy requirements for changelog files.
* Install an upstream changelog file now that upstream provides one.

diff --git a/debian/changelog b/debian/changelog
index 5cda6920d1f76036f601ec5b90d1d7f7c0a69e7e..cdd4de4a5bde81652a727d2d5c56ef2b42f68211 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ openafs (1.5.75-1) UNRELEASED; urgency=low
     - Remove selection of linux-image vs. kernel-image for kernel names.
     - Use Breaks instead of Conflicts.
     - Update standards version to 3.9.0.
+  * Tighten the dependencies on openafs-client in packages that symlink
+    their /usr/share/doc directories to openafs-client's to meet the
+    Policy requirements for changelog files.
   * Remove the lpia architecture.  This was an experiment in Ubuntu that
     has apparently been dropped.
   * Add preliminary support for powerpcspe, mapping that architecture to
@@ -58,6 +61,7 @@ openafs (1.5.75-1) UNRELEASED; urgency=low
     notes are no longer included.
   * Remove conflicts/replaces/provides for openafs-ptutil, which was
     ancient (removed in 2001).
+  * Install an upstream changelog file now that upstream provides one.
   * Update standards version to 3.9.0.
     - Use Breaks instead of Conflicts where appropriate.
 

diff --git a/debian/control b/debian/control
index 1168ec57d981c750a6bfa00578480aa17b88169a..31c5c5a952b7e48db1dfde9bf1e926baba56ac8a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,8 @@ Description: AFS distributed filesystem client support
 Package: openafs-fuse
 Priority: extra
 Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client (>= 1.5.74.1)
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ openafs-client (= ${binary:Version})
 Description: AFS distributed file system experimental FUSE client
  AFS is a distributed filesystem allowing cross-platform sharing of
  files among multiple computers.  Facilities are provided for access
@@ -48,7 +49,8 @@ Description: AFS distributed file system experimental FUSE client
 Package: openafs-kpasswd
 Priority: extra
 Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ openafs-client (= ${binary:Version})
 Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients
 Description: AFS distributed filesystem old password changing
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -76,7 +78,7 @@ Description: AFS distributed filesystem file server
 Package: openafs-dbserver
 Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends},
- openafs-fileserver, openafs-client
+ openafs-fileserver, openafs-client (= ${binary:Version})
 Suggests: openafs-doc
 Description: AFS distributed filesystem database server
  AFS is a distributed filesystem allowing cross-platform sharing of
@@ -200,7 +202,8 @@ Package: libpam-openafs-kaserver
 Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc
 Section: admin
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ openafs-client (= ${binary:Version})
 Description: AFS distributed filesystem kaserver PAM module
  AFS is a distributed filesystem allowing cross-platform sharing of
  files among multiple computers.  Facilities are provided for access

diff --git a/debian/rules b/debian/rules
index 6dcd1775e74bad0cea0693a5e72b72281ae7cd72..2ca48c65ae568673cf04bafd62a7c1fff4709349 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -207,6 +207,7 @@ install-stamp: build-stamp
            debian/$(srcpkg)/usr/share/doc/$(srcpkg)/NEWS.Debian
 
        dh_dkms -V $(VERSION)
+       dh_installchangelogs NEWS
        dh install --after dh_install
        chmod 700 debian/openafs-client/var/cache/openafs
        chmod 700 debian/openafs-dbserver/var/lib/openafs/db