From: LaMont Jones Date: Sat, 4 Aug 2007 03:40:43 +0000 (-0600) Subject: Merge branch 'master' into ubuntu-v2.13 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c5a2d43459e87fa4e8078585fe42505ace0094;p=util-linux Merge branch 'master' into ubuntu-v2.13 Conflicts: debian/changelog debian/control debian/rules Signed-off-by: LaMont Jones --- 45c5a2d43459e87fa4e8078585fe42505ace0094 diff --cc debian/changelog index f3702778,b32fd531..92f60572 --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,30 +1,41 @@@ + util-linux (2.13~rc2-6) unstable-UNRELEASED; urgency=low + + * More fixes from upstream + * swapoff: handle UUID= and LABEL=. Closes: #435555 + * mount.preinst: deal with no /proc/mounts. + + -- LaMont Jones Fri, 3 Aug 2007 09:56:43 -0600 + + util-linux (2.13~rc2-5) unstable; urgency=low + + * mount.preinst: + - check the right directory for mount.nfs. + Closes: #435307, #435414, #435223 + - look for ' nfs ' mounts. Closes: #435305 + + -- LaMont Jones Tue, 31 Jul 2007 22:34:08 -0600 + + util-linux (2.13~rc2-4) unstable; urgency=low + + * switch to using libvolume-id-dev + * Recommend: nfs-common so that portmap doesn't become defacto-Required. + NFS mounts will not work unless nfs-common is upgraded to at least the + Recommended version, so now mount.preinst will fail if there are NFS + mounts and no /usr/sbin/mount.nfs. Closes: #435204, #435223, #435125 + + -- LaMont Jones Mon, 30 Jul 2007 08:07:37 -0600 + +util-linux (2.13~rc2-3ubuntu1) gutsy; urgency=low + + * Merge ubuntu changes: + - Add udev rule for calling /sbin/hwclock --hctosys dynamically: + + debian/hwclock.rules, debian/hwclock.udev: Rule and script. + + debian/rules: Install those. + - use libvolume-id instead of blkid. This will be true for debian once a + current enough udev is available. + + -- LaMont Jones Sun, 29 Jul 2007 11:31:21 -0600 + util-linux (2.13~rc2-3) unstable; urgency=low * add option for 8-bit chars in agetty. Closes: #221290