X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fchangelog;h=805dfbebcf3483c853f9a6e530ebd68d311b4e8b;hp=618d70d266de866ebaed1a1fad1a13fd1fc51567;hb=HEAD;hpb=405eb02c20c348307a696d3afc8b22d212a77cdb

diff --git a/debian/changelog b/debian/changelog
index 618d70d..805dfbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,94 @@
 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:
+
+  [ Martin Pitt ]
+  * Add 00git-start-statd-systemd.patch: Latest start-statd script from
+    1.3.2 to start rpc-statd.service under systemd.
+  * Add 23-systemd-pipefs_in_run.patch: systemd: Mount rpc_pipefs in /run instead of
+    /var/lib/nfs/, like in the upstart units.
+  * Add 24-systemd-daemon-paths.patch: Adjust program paths in systemd units.
+  * debian/nfs-kernel-server.links: Add nfs-kernel-server.service alias
+    symlink, to match SysV init script.
+  * Add 25-systemd-server-before-client.patch: Order NFS server before client,
+    to make mounting NFS shares from localhost work reliably.
+  * Add debian/nfs-utils_env.sh: Translate our /etc/default files into runtime
+    configuration for nfs-config.service.
+  * debian/nfs-{common,kernel-server}.install: Install systemd units.
+  * debian/rules: Enable/start systemd units. (LP: #1312976)
+
+  * Add autopkgtest for installing server and client on localhost, setting up
+    two exports, rebooting, and ensuring that the NFS mounts work.
+  * Add 23-systemd-relax-dependencies.patch: Stop depending on basic.target in
+    the daemons which still do; i. e. add DefaultDependencies=no. This makes
+    it possible to run NFS during early boot, helps if you e. g. have /var
+    on NFS, and avoids dependency cycles with rcS init.d scripts which depend
+    on $remote_fs. (LP: #1428487)
+  * Shift number prefixes of other systemd patches accordingly, and adjust
+    them to the above patch.
+
+  * 27-systemd-enable-with-systemctl-statd.patch: let the admin
+    enable/disable statd via systemd tools. (LP: #1428486)
+  * debian/rules: don't start statd by default (or it will trigger upstart
+    and systemd statd unit startup).
+  * debian/control, debian/*install: move nfs-utils.service to nfs-common
+    package. (LP: #1436304)
+
+  [ Steve Langasek ]
+  * Add a dependency on keyutils to nfs-common, so that idmapping will work
+    under systemd.  LP: #1449074.
+
+  Followup changes to complement merge from ubuntu:
+
+  [ Andreas Henriksson ]
+  * Restore anything related to nfs-common.init and nfs-common.default
+  * debian/nfs-common.links: Mask nfs-common init script with a symlink
+    to /dev/null to avoid using it under systemd.
+  * Explicitly set executable permissions on nfs-utils_env.sh helper
+    instead of relying on debian/nfs-utils_env.sh having correct
+    permissions in source directory.
+
+  All of the above Closes: #796637
+
+  Additional changes while at it:
+
+  [ Andreas Henriksson ]
+  * Make nfs-kernel-server depend on netbase since it needs /etc/services
+    for nfs-server to start (which is required for successful pkg install).
+    - Avoids "...unable to resolve ANYADDR:nfs to inet address: ..."
+
+  [ Martin Pitt ]
+  * 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
 
   * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc-