-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2011-06-20 22:31:50 UTC
-
mfrom:
(1.6.3 upstream)
(4.5.1 sid)
-
Revision ID:
james.westby@ubuntu.com-20110620223150-lz8wrv0946ihcz3z
Tags: 2.19.1-2ubuntu1
* Merge from Debian unstable, remaining changes:
- Build for multiarch.
- Add pre-depends on multiarch-support.
- configure.ac: don't try to be clever about extracting a path name from
$libdir to append to /usr in a way that's not overridable; instead,
reuse the built-in configurable libexecdir.
- Fix up the .pc.in files to know about libexecdir, so our substitutions
don't leave us with unusable pkg-config files.
- Install custom blkid.conf to use /dev/.blkid.tab since we don't
expect device names to survive a reboot
- Mention mountall(8) in fstab(5) manpages, along with its special
options.
- Since upstart is required in Ubuntu, the hwclock.sh init script is not
called on startup and the hwclockfirst.sh init script is removed.
- Drop depends on initscripts for the above.
- Replace hwclock udev rule with an Upstart job.
- For the case where mount is called with a directory to mount, look
that directory up in mountall's /lib/init/fstab if we couldn't find
it mentioned anywhere else. This means "mount /proc", "mount /sys",
etc. work.
- mount.8 points to the cifs-utils package, not the obsolete smbfs one.
* Dropped changes:
- mount.preinst: lsb_release has been fixed in lucid and above to be
usable without configuration, so we don't have to diverge from Debian
here anymore.
* Changes merged upstream:
- sfdisk support for '+' with '-N'
- mount/umount.c: fix a segfault on umount with empty mtab entry
- Fix arbitrary unmount with fuse security issue