X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fcontrol;h=51b1a11af825939a6d883c38012e915cda28b0dc;hp=537d2d6c85d3aedeebc3e940976b34c17848ef9b;hb=8771b17b618ba46e2e3a1e7eec608b9a71245d36;hpb=f9cfe7c8a02ef187e411d5019ee0b6fe266e0cb1

diff --git a/debian/control b/debian/control
index 537d2d6..51b1a11 100644
--- a/debian/control
+++ b/debian/control
@@ -1,40 +1,46 @@
 Source: nfs-utils
 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, pkg-config, quilt (>= 0.40)
-Build-Conflicts: librpcsecgss-dev (= 0.14-1)
-Standards-Version: 3.7.2
+Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
+Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Steve Langasek <vorlon@debian.org>
+Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev
+Standards-Version: 3.9.0
+Homepage: http://nfs.sourceforge.net/
+Vcs-Git: git://git.debian.org/kernel/nfs-utils.git
+Vcs-Browser: http://git.debian.org/?p=kernel/nfs-utils.git
 
 Package: nfs-kernel-server
 Priority: optional
 Architecture: any
-Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4)
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
-Description: Kernel NFS server support
- Use this package if you want to use the kernel-mode NFS server.
- The user-mode NFS server in the "nfs-user-server" package is slower
- and less featureful but easier to debug than the kernel-mode server.
+Description: support for NFS kernel server
+ The NFS kernel server is currently the recommended NFS server for use
+ with Linux, featuring features such as NFSv3 and NFSv4, Kerberos
+ support via GSS, and much more. It is also significantly faster and
+ usually more reliable than the user-space NFS servers (from the
+ unfs3 and nfs-user-server packages). However, it is more difficult to
+ debug than the user-space servers, and has a slightly different
+ feature set.
  .
- Upstream: SourceForge project "nfs", CVS module nfs-utils.
- .
-  Homepage: http://nfs.sourceforge.net/
+ This package contains the user-space support needed to use the
+ NFS kernel server. Most administrators wishing to set up an NFS server
+ would want to install this package.
+Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-common
 Architecture: any
-Depends: portmap, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3), libtirpc1 (>= 0.2.4)
+Recommends: python
+Suggests: open-iscsi, watchdog
 Provides: nfs-client
 Conflicts: nfs-client
-Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)
+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
- and idmapd.
- .
- Upstream: SourceForge project "nfs", CVS module nfs-utils.
- .
-  Homepage: http://nfs.sourceforge.net/
-
+ server.  Programs included: lockd, statd, showmount, nfsstat, gssd,
+ idmapd and mount.nfs.
+Homepage: http://nfs.sourceforge.net/