Move rpc.svcgssd to nfs-common (Closes: #651558).

diff --git a/debian/changelog b/debian/changelog
index db932eef1b9d49716fea5e922662abb20e6ab2cb..d987e70a0a57bb244f0985cd8bc46a5b62ac8886 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 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).
 
- -- Luk Claes <luk@debian.org>  Sun, 22 Jan 2012 15:21:48 +0100
+ -- Luk Claes <luk@debian.org>  Sun, 22 Jan 2012 15:38:04 +0100
 
 nfs-utils (1:1.2.5-3) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 88f59132ce1cb2511666b13627a16b9f6af4e12d..54c01fc1f60fc68e92af3914d1a7b6fcfc99a0a0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>=
 Recommends: python
 Provides: nfs-client
 Conflicts: nfs-client
-Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5), mount (<< 2.13~)
+Replaces: nfs-client, nfs-kernel-server (<< 1:1.2.5-4), 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,

diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index c7e463eb8072de9309658a79e5d6c918b692a810..c07045e2735d53492785e2683306870fa5033f36 100644 (file)
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -13,6 +13,7 @@ debian/tmp/usr/sbin/nfsiostat
 debian/tmp/usr/sbin/mountstats
 debian/tmp/usr/sbin/rpc.gssd
 debian/tmp/usr/sbin/rpc.idmapd
+debian/tmp/usr/sbin/rpc.svcgssd
 debian/tmp/usr/sbin/gss_clnt_send_err
 debian/tmp/usr/sbin/gss_destroy_creds
 debian/tmp/usr/sbin/rpcdebug

diff --git a/debian/nfs-kernel-server.install b/debian/nfs-kernel-server.install
index 8ac8e2adfa5a52735234209f352656fd58b5ddeb..3cc01e844fba634791f34b21a4c6d984e8b08615 100644 (file)
--- a/debian/nfs-kernel-server.install
+++ b/debian/nfs-kernel-server.install
@@ -1,7 +1,6 @@
 debian/tmp/usr/sbin/exportfs
 debian/tmp/usr/sbin/rpc.mountd
 debian/tmp/usr/sbin/rpc.nfsd
-debian/tmp/usr/sbin/rpc.svcgssd
 debian/tmp/var/lib/nfs/xtab
 debian/tmp/var/lib/nfs/etab
 debian/tmp/var/lib/nfs/rmtab