2.12r-11ubuntu1

diff --cc debian/changelog
index 7fcd708098ebc5b24e041c92ac321d484ae1c2a8,fbdc4ba4f4fb7c8f54996c842723f82a2750b3d8..5f693375385fb6a185cb83d7dac61b1766c5866e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,11 +1,40 @@@
++util-linux (2.12r-11ubuntu1) edgy; urgency=low
++
++  * Merge NFS fix from Debian.
++
++ -- LaMont Jones <lamont@ubuntu.com>  Tue, 19 Sep 2006 14:04:00 -0600
++
+ util-linux (2.12r-11) unstable; urgency=low
+ 
+   * typos in NFSv4 (GSSDLCK didn't have .pid, and the latest
+     nfs-common no longer creates the file at all.) Closes: #376931
+     - modified 30nfs4-fix.dpatch
+ 
+  -- LaMont Jones <lamont@debian.org>  Tue, 19 Sep 2006 09:33:31 -0600
+ 
 +util-linux (2.12r-10ubuntu3) edgy; urgency=low
 +
 +  * Helps if I add a Build-Depend on libvolumeid
 +
 + -- Scott James Remnant <scott@ubuntu.com>  Mon, 21 Aug 2006 19:26:53 +0200
 +
 +util-linux (2.12r-10ubuntu2) edgy; urgency=low
 +
 +  * Correct FTFBS on current edgy because _syscall5 went away.
 +
 +  * Steal the libvolume_id-support patch from SuSE and apply here so that
 +    we use libvolume_id for accessing devices via UUID and/or LABEL instead
 +    of the less-capable blkid.
 +
 + -- Scott James Remnant <scott@ubuntu.com>  Mon, 21 Aug 2006 15:23:58 +0200
 +
 +util-linux (2.12r-10ubuntu1) edgy; urgency=low
 +
 +  [ Ubuntu Merge-o-Matic ]
 +  * Merge from debian unstable.
 +
 + -- Scott James Remnant <scott@ubuntu.com>  Thu, 29 Jun 2006 23:39:59 +0100
 +
  util-linux (2.12r-10) unstable; urgency=low
  
    * NFSv4 patch fixes for cfs.  Closes: #367049

diff --cc debian/patches/30nfs4.dpatch
index ff1dc86e1cda3c2060e4e5fa2a0f35d2ba71c8fd,d943282392f56dcd338840af00bacfbecc7d6beb..d943282392f56dcd338840af00bacfbecc7d6beb
mode 100644,100755..100644
--- 1/debian/patches/30nfs4.dpatch
--- 2/debian/patches/30nfs4.dpatch
+++ b/debian/patches/30nfs4.dpatch