Merge branch 'master' into ubuntu-v2.13

fix hurd-i386 build-depends

Conflicts:

	debian/control

diff --cc debian/changelog
index 2679578fc2aeb5ad976fdfcb24101385568a5291,abac3791f483f35aabb8eac6628fe258353bf71d..3a5fe1f1d684a5391384d5c3b925b44f4320757f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -10,18 -1,10 +10,19 @@@ util-linux (2.13~rc3-2ubuntu1) gutsy; u
  util-linux (2.13~rc3-2) unstable; urgency=low
  
    * mount should Suggest nfs-common, not Recommend it.
+   * Fix build-depends for hurd-i386.  Closes: #333147
  
-  -- LaMont Jones <lamont@debian.org>  Wed,  8 Aug 2007 13:17:42 -0600
+  -- LaMont Jones <lamont@debian.org>  Wed,  8 Aug 2007 13:34:42 -0600
  
 +util-linux (2.13~rc3-1ubuntu1) gutsy; urgency=low
 +
 +  * Merge ubuntu changes into a new Debian version.  Remaining:
 +    - Add udev rule for calling /sbin/hwclock --hctosys dynamically:
 +      + debian/hwclock.rules, debian/hwclock.udev: Rule and script.
 +      + debian/rules: Install those.
 +
 + -- LaMont Jones <lamont@ubuntu.com>  Wed,  8 Aug 2007 11:57:03 -0600
 +
  util-linux (2.13~rc3-1) unstable; urgency=low
  
    * New upstream version

diff --cc debian/control
index 0eb1330879b44e8f13e506a17a0346770ed36dff,9691855bba204fcc9a4405865afbd0346bbc07a3..297969c76e1ffe4275d978fe90225c7dcf848449
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,9 -1,8 +1,9 @@@
  Source: util-linux
  Section: base
  Priority: required
- Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>= 093-0ubuntu11), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64]
 -Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>=0.113-2), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 -Maintainer: LaMont Jones <lamont@debian.org>
++Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4-1), gettext, zlib1g-dev, libvolume-id-dev (>= 113), uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 +XSBC-Original-Maintainer: LaMont Jones <lamont@debian.org>
  Standards-Version: 3.7.2.0
  
  Package: util-linux