Move the rpc.svcgssd(8) symlink to nfs-common along with the rest of it, and add...

diff --git a/debian/changelog b/debian/changelog
index d43aa043919da5e8e77385a41ca460e08c5c2724..b2f6e8a2932ff5fc2f951f6c3666d7fbb1879382 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ nfs-utils (1:1.2.8-6) UNRELEASED; urgency=medium
 
   * Fix the sec=krb5* handling in debian/nfs-common.init to properly match
     all cases.  Closes: #715478.
 
   * Fix the sec=krb5* handling in debian/nfs-common.init to properly match
     all cases.  Closes: #715478.

+  * Move the rpc.svcgssd(8) symlink to nfs-common along with the rest of it,
+    and add the Replaces: on old versions of nfs-kernel-server to support
+    upgrades properly.

 
  -- Steve Langasek <vorlon@debian.org>  Mon, 13 Jan 2014 22:19:43 +0000
 
 
  -- Steve Langasek <vorlon@debian.org>  Mon, 13 Jan 2014 22:19:43 +0000
 

diff --git a/debian/control b/debian/control
index a10570969aa8f7a9308a4caa45347eaaadb060f0..021c5a6284fdda3e77d06ccde964c0c1fe6f290b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,8 @@ Recommends: python
 Suggests: open-iscsi, watchdog
 Provides: nfs-client
 Conflicts: nfs-client
 Suggests: open-iscsi, watchdog
 Provides: nfs-client
 Conflicts: nfs-client

-Replaces: nfs-client, nfs-kernel-server (<< 1:1.2.6-3), mount (<< 2.13~)
+Breaks: nfs-kernel-server (<< 1:1.2.8-6~)
+Replaces: nfs-client, nfs-kernel-server (<< 1:1.2.8-6~), mount (<< 2.13~)

 Description: NFS support files common to client and server
  Use this package on any machine that uses NFS, either as client or
  server.  Programs included: lockd, statd, showmount, nfsstat, gssd,
 Description: NFS support files common to client and server
  Use this package on any machine that uses NFS, either as client or
  server.  Programs included: lockd, statd, showmount, nfsstat, gssd,

diff --git a/debian/nfs-common.links b/debian/nfs-common.links
index 917c10b98d388b9f1c986a6d81bf2fbafd99682d..d84465d021cb39acbd9add2df2f193af08b99b7c 100644 (file)
--- a/debian/nfs-common.links
+++ b/debian/nfs-common.links
@@ -2,3 +2,4 @@ usr/share/man/man8/gssd.8 usr/share/man/man8/rpc.gssd.8
 usr/share/man/man8/statd.8 usr/share/man/man8/rpc.statd.8
 usr/share/man/man8/idmapd.8 usr/share/man/man8/rpc.idmapd.8
 usr/share/man/man8/sm-notify.8 usr/share/man/man8/rpc.sm-notify.8
 usr/share/man/man8/statd.8 usr/share/man/man8/rpc.statd.8
 usr/share/man/man8/idmapd.8 usr/share/man/man8/rpc.idmapd.8
 usr/share/man/man8/sm-notify.8 usr/share/man/man8/rpc.sm-notify.8

+usr/share/man/man8/svcgssd.8 usr/share/man/man8/rpc.svcgssd.8

diff --git a/debian/nfs-kernel-server.links b/debian/nfs-kernel-server.links
index f029f2e24bf40b1508bb8251649712e9e6c3a300..94322c20eba89200ef19b2e92750e0f1630e2892 100644 (file)
--- a/debian/nfs-kernel-server.links
+++ b/debian/nfs-kernel-server.links
@@ -1,3 +1,2 @@
 usr/share/man/man8/mountd.8 usr/share/man/man8/rpc.mountd.8
 usr/share/man/man8/nfsd.8 usr/share/man/man8/rpc.nfsd.8
 usr/share/man/man8/mountd.8 usr/share/man/man8/rpc.mountd.8
 usr/share/man/man8/nfsd.8 usr/share/man/man8/rpc.nfsd.8

-usr/share/man/man8/svcgssd.8 usr/share/man/man8/rpc.svcgssd.8