-
Committer:
Package Import Robot
-
Author(s):
Steve Langasek
-
Date:
2012-06-29 03:14:53 UTC
-
mfrom:
(4.5.11 sid)
-
Revision ID:
package-import@ubuntu.com-20120629031453-pycuyxu680obaixm
Tags: 2.20.1-5.1ubuntu1
* Merge from Debian unstable, remaining changes:
- Install custom blkid.conf to use /dev/.blkid.tab since we don't
expect device names to survive a reboot
- Build-depend on gettext:any for cross-building support.
- Mark libmount1 Multi-Arch: same.
- Replace hwclock udev rule with an Upstart job.
- Since upstart is required in Ubuntu, the hwclock.sh init script is not
called on startup.
- Drop depends on initscripts for the above.
- Mention mountall(8) in fstab(5) manpages, along with its special
options.
- 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, included in Debian:
- Build for multiarch.
- Add pre-depends on multiarch-support.
- Use canonicalize_spec in getmntdevbackward. proc should not be
interpreted as a non-canonical-path.
- term-utils/agetty.c: allow getty to work on /dev/pts/N
- Fix up the .pc.in files to know about libexecdir, so our substitutions
don't leave us with unusable pkg-config files.
- 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.
- Remove the hwclockfirst.sh init script.
* Do not replace /etc/default/rcS with /etc/adjtime. This has already
been analyzed carefully in Ubuntu, and /etc/adjtime is not beneficial
at all.