Merge branch 'upstream'

[nfs-utils.git] / debian / control

diff --git a/debian/control b/debian/control
index 69229be5a7f0d3a23c4f2e14a554a429599e79f1..995347ae62667a0891848700af37f0920ffb5e99 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Priority: standard
 Section: net
 Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
 Uploaders: Steinar H. Gunderson <sesse@debian.org>, Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev, librpcsecgss-dev, libblkid-dev, pkg-config, quilt (>= 0.40)
-Build-Conflicts: librpcsecgss-dev (= 0.14-1)
+Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev (>= 0.1-1), librpcsecgss-dev (>= 0.16-1), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40)
 Standards-Version: 3.7.2
 
 Package: nfs-kernel-server
@@ -33,10 +32,10 @@ Description: support for NFS kernel server
 
 Package: nfs-common
 Architecture: any
-Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), ${shlibs:Depends}
+Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), initscripts (>= 2.86.ds1-38.1), ${shlibs:Depends}
 Provides: nfs-client
 Conflicts: nfs-client
-Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)
+Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5), 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