merge 2.17.2-3.3

diff --cc debian/changelog
index 67aa47060656325567907f0e90b6b5c82adac3c9,6c4423aa5c9f8cdf64a7af88798678cb52868291..10d3493ecc307c2291e0e46399f28c60246f2aeb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,29 +1,52 @@@
 +util-linux (2.17.2-4) unstable; urgency=low
 +
 +  [Miklos Szeredi]
 +
 +  * mount: don't canonicalize "spec" with --no-canonicalize option. 
 +    Closes: #593336
 +
 +  [Karel Zak]
 +
 +  * fdisk: fix freespace boundaries calculation on SGI disklabel. 
 +    Closes: #510130
 +
 +  [LaMont Jones]
 +
 +  * Deliver agetty as both agetty and getty, preferring agetty. 
 +    Closes: #117596
 +  * Declare source format (1.0)
 +  * use debconf (iff installed) to warn about noauto fileysstems with non-zero
 +    pass numbers.  Closes: #566072
 +  * update lintian-overrides, actually install them in the deb
 +
 + -- LaMont Jones <lamont@debian.org>  Fri, 24 Dec 2010 14:06:47 -0700
 +
+ util-linux (2.17.2-3.3) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Report correct disk size on GNU/kFreeBSD.  Thanks Tuco.
+     (Closes: #592292)
+ 
+  -- Robert Millan <rmh@debian.org>  Wed, 29 Sep 2010 09:18:08 +0200
+ 
+ util-linux (2.17.2-3.2) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Revert the switch from slang2 to ncurses5.  There is no udeb for ncurses,
+     so that change broke cfdisk-udeb (closes: #593374, reopens: #581631).
+ 
+  -- Julien Cristau <jcristau@debian.org>  Thu, 23 Sep 2010 21:12:33 +0200
+ 
+ util-linux (2.17.2-3.1) unstable; urgency=high
+ 
+   * Non-maintainer upload.
+   * Apply trivial patch by Adam D. Barratt (thanks!): Only attempt to link
+     locale-specific files in to the cfdisk-udeb hierarchy if cfdisk-udeb
+     is actually being built.  Closes: #581725
+   * Set urgency to “high” since some packages are waiting for util-linux.
+ 
+  -- Cyril Brulebois <kibi@debian.org>  Sun, 20 Jun 2010 16:03:46 +0200
+ 
  util-linux (2.17.2-3) unstable; urgency=low
  
    [LaMont Jones]

diff --cc debian/control
index 2d1b88e13aff20d8c2b4b6cff5f549c9f2840c37,e915394f49accc04b315190d8a6c53022c264547..230d4d1e70a123eb4185bd1dd1581c2dc7811ab2
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,5 -1,5 +1,5 @@@
  Source: util-linux
- Build-Depends: libncurses5-dev, libncurses5, gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config, po-debconf
 -Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config
++Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config, po-debconf
  Section: base
  Priority: required
  Uploaders: Scott James Remnant <scott@ubuntu.com>

diff --cc debian/rules
Simple merge