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

diff --git a/debian/changelog b/debian/changelog
index d69c7a1..267c575 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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.