* Add a missing conflict on older versions of openafs-client to

  openafs-krb5 to ensure that the klog transition to alternatives is
  smooth.

diff --git a/debian/changelog b/debian/changelog
index 701eaef2c65a32fc1c6136ac3e239b2eaa5302ee..809b665ccd7c1e6e6f6d6330249b6c3969e0d536 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openafs (1.4.7.dfsg1-2) UNRELEASED; urgency=low
+
+  * Add a missing conflict on older versions of openafs-client to
+    openafs-krb5 to ensure that the klog transition to alternatives is
+    smooth.
+
+ -- Russ Allbery <rra@debian.org>  Fri, 09 May 2008 10:16:28 -0700
+
 openafs (1.4.7.dfsg1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index d72177ddd7f5e40a63838dd9c0fec2d84e23ab97..890ae265c3d4a32a3de4aa7cf629ec1b0c46eda1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -80,6 +80,7 @@ Description: AFS distributed filesystem documentation
 Package: openafs-krb5
 Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Depends: ${shlibs:Depends}
+Conflicts: openafs-client (<< 1.4.7.dfsg1-1)
 Description: AFS distributed filesystem Kerberos 5 integration
  AFS is a distributed filesystem allowing cross-platform sharing of files
  among multiple computers.  Facilities are provided for access control,