Drop patches which are applied upstream

[nfs-utils.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f77a5562e53aae67d047d36fa4d0d2dd940f2195..b70bb3f1caa3603a1783c12ff145f2c1058014ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+nfs-utils (1:1.2.5-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    - deleted: 13-preserve-explicit-port-2049.patch
+    - deleted: 17-Fix-statd.8-manpage-syntax-visible.patch
+    - deleted: 18-Fix-nfsiostat.8-manpage-syntax-missing-.I.patch
+    - deleted: 19-exports.man-Fix-comment-syntax.patch
+    - deleted: 20-nfs.man-Fix-fstab-example.patch
+    - deleted: 22-start-statd-Use-bash.patch
+    - deleted: 23-nfs.man-escape-nroff-for-proper-rendering.patch 
+
+ -- Luk Claes <luk@debian.org>  Sun, 02 Oct 2011 17:01:07 +0200
+
+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
@@ -6,9 +30,12 @@ nfs-utils (1:1.2.4-1) unstable; urgency=low
     (Closes: #619877)
     - Add --enable-libmount-mount (Closes: #626478)
     - 12-svcgssd-document-n-option.patch applied upstream
-    - 21-anticipate-RLIMIT_FSIZE.patch applied upstream 
+    - 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 15:07:34 +0200
+ -- Luk Claes <luk@debian.org>  Sat, 09 Jul 2011 16:28:32 +0200
 
 nfs-utils (1:1.2.3-3) unstable; urgency=medium