X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fchangelog;h=267c5756b959fff53c3a8b40e5226f52f3247e50;hp=d987e70a0a57bb244f0985cd8bc46a5b62ac8886;hb=5af2f5885d1152218ffa81995e6b25ee3dc8f71a;hpb=78bc3564dde31a3631fcc33cd04d17f42500f822

diff --git a/debian/changelog b/debian/changelog
index d987e70..267c575 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,22 @@
+nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low
+
+  * New upstream version
+    - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream.
+    - Update other patches.
+    - Install osd_login (part of the autologin feature).
+      - Add open-iscsi and watchdog to Recommends.
+  * Check for blank exports file (Closes: #673798).
+  * Add 18-osd_login-sbindir.patch to avoid FTBFS
+
+ -- Luk Claes <luk@debian.org>  Fri, 25 May 2012 19:16:54 +0200
+
 nfs-utils (1:1.2.5-4) unstable; urgency=low
 
   * Add libmount-dev to Build-Depends and explicitly enable it.
   * Move rpc.svcgssd to nfs-common (Closes: #651558).
+  * Also change owning group for /var/lib/nfs (Closes: #651634).
 
- -- Luk Claes <luk@debian.org>  Sun, 22 Jan 2012 15:38:04 +0100
+ -- Luk Claes <luk@debian.org>  Sun, 22 Jan 2012 15:46:25 +0100
 
 nfs-utils (1:1.2.5-3) unstable; urgency=low