X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Fchangelog;h=745844619268293db6879376676f5ed29b19ecab;hb=3ad7dea527170ae12c9cdc2e428d0676ac261144;hp=e71043140346e31e6241a4d5cb34b34088ed909c;hpb=3d3bc354f5fc8653fa0e0714f04788e5c5c2d2e2;p=nfs-utils.git

diff --git a/debian/changelog b/debian/changelog
index e710431..7458446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.2.4-2) UNRELEASED; urgency=low
+
+  [ Luk Claes ]
+  * nfs-kernel-server-default: Add comment about how to disable NFSv4
+
+  [ Ben Hutchings ]
+  * nfs.man: escape ' nroff for proper rendering, thanks to Simon Paillard
+    (Closes: #636278)
+
+ -- Luk Claes <luk@debian.org>  Sat, 06 Aug 2011 07:38:48 +0200
+
 nfs-utils (1:1.2.4-1) unstable; urgency=low
 
   * New upstream version
@@ -9,8 +20,9 @@ nfs-utils (1:1.2.4-1) unstable; urgency=low
     - Refresh 19-exports.man-Fix-comment-syntax.patch
     - 21-anticipate-RLIMIT_FSIZE.patch applied upstream
     - Add nfsidmap binary and manpage
+    - Use autoreconf to avoid build failure
 
- -- Luk Claes <luk@debian.org>  Sat, 09 Jul 2011 16:20:30 +0200
+ -- Luk Claes <luk@debian.org>  Sat, 09 Jul 2011 16:28:32 +0200
 
 nfs-utils (1:1.2.3-3) unstable; urgency=medium