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!
** Changed in: nfs-utils (Ubuntu)
Status: New => Incomplete
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/685860
Title:
Please merge nfs-utils 1:1.2.2-4 (main) from debian unstable (main)
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
