Please merge nfs-utils 1:1.2.2-4 (main) from debian unstable (main)

This debdiff didn't apply cleanly to the latest version in natty (1:1.2.2-1ubuntu1), can you please recreate this with "-v1:1.2.2-1ubuntu1".

I've reviewed it the best I can, looks good to me. I merged it into the ubuntu bzr branch and proposed it for merging/uploading for someone better qualified to test nfs-utils. Thanks!

Hmm, okay, I took a look at Ken's branch, but it still has conflicts:

Text conflict in debian/control
Conflict adding file debian/nfs-common.gssd.upstart. Moved existing file to debian/nfs-common.gssd.upstart.moved.
Conflict adding file debian/nfs-common.idmapd.upstart. Moved existing file to debian/nfs-common.idmapd.upstart.moved.
Text conflict in debian/nfs-common.postinst
Text conflict in debian/nfs-common.postrm
Conflict adding file debian/nfs-common.preinst. Moved existing file to debian/nfs-common.preinst.moved.
Conflict adding file debian/nfs-common.rpc_pipefs.upstart. Moved existing file to debian/nfs-common.rpc_pipefs.upstart.moved.
Conflict adding file debian/nfs-common.statd.upstart. Moved existing file to debian/nfs-common.statd.upstart.moved.

I spent some time looking at this, but it's a pretty nasty merge -- not something I can tackle easily within my patchpilot time today.

I'm marking Incomplete, and unsubscribing ubuntu-sponsors, as this merge proposal isn't quite ready yet.

Please clear the conflicts, and I'll be happy to take another look. Thanks!

Please, review the attached debdiff instead.

This bug was fixed in the package nfs-utils - 1:1.2.2-4ubuntu1

---------------
nfs-utils (1:1.2.2-4ubuntu1) natty; urgency=low

  * 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.

nfs-utils (1:1.2.2-4) unstable; urgency=low

  * mountd: fix path comparison for v4 crossmnt (Closes: #578317)
  * nfs-common.init: Ignore empty and commented-out fstab lines, thanks
    to Cristian Ionescu-Idbohrn (Closes: #587329)

nfs-utils (1:1.2.2-3) unstable; urgency=low

  * mount.nfs: Preserve explicit port=2049 option (Closes: #582003)
  * rpc.statd: Allow monitoring of addresses without names (Closes: #579397)
  * Add control fields pointing to the new git repository

nfs-utils (1:1.2.2-2) unstable; urgency=low

  [ Vagrant Cascadian ]
  * Ensure files under /var/lib/nfs/ are owned by statd user.
    Closes: #574510

  [ Anibal Monsalve Salazar ]
  * Fix out-of-date-standards-version
 -- Lorenzo De Liso <email address hidden> Wed, 15 Dec 2010 21:42:55 +0100