-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2011-07-23 17:54:36 UTC
-
mfrom:
(14.1.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110723175436-mu7zaa6637prifpq
* Merge from Debian unstable (LP: #728586, LP: #789117), remaining
changes:
- debian/nfs-common.{statd,statd-mounting,gssd,idmapd}.upstart,
debian/control, debian/nfs-common.{preinst,postinst,prerm,postrm},
debian/rules: drop nfs-common init script in favor of upstart jobs,
and build-depend on debhelper (>= 7.3.15ubuntu3) for correct upstart
init handling.
- Depend on rpcbind (>= 0.2.0-6ubuntu1) for upstart support.
- debian/nfs-kernel-server.postinst: don't call "invoke-rc.d nfs-common"
in the postinst, this is redundant anyway and the nfs-common init script
is gone now.
- nfs-kernel-server.default: Add comment about how to disable nfs4.
- debian/patches/multiarch-kerberos-paths: Search for kerberos libs
in multiarch locations.
- nfs-kernel-server.init: Unmount nfsd fs when init script stops
- ubuntu-fix-kernel-version-handling: avoid segfaults from short kernel
version numbers.