Merge branch 'sid'

[nfs-utils.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 05a2ccea0f9b78e8c156211d51a8a801f9f486b6..805dfbebcf3483c853f9a6e530ebd68d311b4e8b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium
+
+  [ Ben Hutchings ]
+  * Update debian/watch
+
+  [ Salvatore Bonaccorso ]
+  * Fix typo in comment for installed idmapd.conf.
+    Thanks to Ferenc Wágner (Closes: #841387)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Mar 2015 16:33:59 +0000
+
+nfs-utils (1:1.2.8-9.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Really add keyutils as a dependency of nfs-common. (Closes: #830777)
+    - changelog entry included but actual change missed when partially
+      merging the ubuntu delta in previous NMU.
+  * Add debian/patches/unbreak-blkmapd-rpc_pipefs-run.patch (Closes: #828826)
+    - patch from Christoph Hellwig to unbreak blkmapd after move of
+      rpc_pipefs to /run.
+  * Add debian/patches/unbreak-gssd-rpc_pipefs-run.patch (Closes: #632141)
+    - similarly to blkmapd also unbreak gssd. Thanks to Christoph Hellwig
+      for pointing this out.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Thu, 11 Aug 2016 18:50:24 +0200
+
 nfs-utils (1:1.2.8-9.1) unstable; urgency=medium
 
   Partial sync from ubuntu, included changes:
@@ -61,6 +87,7 @@ nfs-utils (1:1.2.8-9.1) unstable; urgency=medium
   * Drop obsolete versioned initscripts dependency. (Closes: #804990)
 
  -- Andreas Henriksson <andreas@fatal.se>  Tue, 28 Jun 2016 02:05:16 +0200
+>>>>>>> sid
 
 nfs-utils (1:1.2.8-9) unstable; urgency=medium