From: Russ Allbery <rra@debian.org>
Date: Wed, 21 Apr 2010 00:50:18 +0000 (-0700)
Subject: Add changelog entries for upstream cherry picks
X-Git-Tag: debian/1.5.74-2~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2854242e358e0f6bed6c0647b9ad73b994d6c0c1;p=packages%2Fo%2Fopenafs.git

Add changelog entries for upstream cherry picks
---

diff --git a/debian/changelog b/debian/changelog
index 600401c43..2bceb8a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 openafs (1.5.74-2) UNRELEASED; urgency=low
 
+  * Apply upstream deltas:
+    - [e6f6c349] Fixes and clarifications to vos setaddrs man page
+    - [d80382ef] Remove special-case call for KAM_SetPassword on s390
   * Add build dependency on libfuse-dev and pass --enable-fuse-client to
     configure so that the new FUSE afsd is built.  Install afsd.fuse into
     the openafs-client package for the time being.  There is, as yet, no