-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-12-15 21:42:55 UTC
-
mfrom:
(14.1.8 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20101215214255-axlt44fw7etyxxri
Tags: 1:1.2.2-4ubuntu1
* Merge from debian unstable (LP: #685860), remaining changes:
- debian/nfs-common.{statd,gssd,idmapd,rpc_pipefs}.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.
- debian/control:
+ depend on the upstart-using version of portmap, 6.0-10ubuntu1; and
drop the alternative depends on rpcbind, which hasn't been converted.
+ depend on portmap 6.0-10ubuntu1.
- 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.