-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2011-02-15 23:36:47 UTC
-
mfrom:
(3.2.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110215233647-zstvzno45djthnph
Tags: 1.1.1-6.1ubuntu1
* Merge from Debian unstable, remaining changes:
- debian/libpam-modules.postinst: Add PATH to /etc/environment if it's
not present there or in /etc/security/pam_env.conf. (should send to
Debian).
- debian/libpam0g.postinst: only ask questions during update-manager when
there are non-default services running.
- debian/patches-applied/series: Ubuntu patches are as below ...
- debian/patches-applied/ubuntu-rlimit_nice_correction: Explicitly
initialise RLIMIT_NICE rather than relying on the kernel limits.
- Change Vcs-Bzr to point at the Ubuntu branch.
- debian/patches-applied/pam_motd-legal-notice: display the contents of
/etc/legal once, then set a flag in the user's homedir to prevent
showing it again.
- debian/update-motd.5, debian/libpam-modules.manpages: add a manpage
for update-motd, with some best practices and notes of explanation.
- debian/patches/update-motd-manpage-ref: add a reference in pam_motd(8)
to update-motd(5)
* Dropped changes:
- libpam-modules depend on base-files (>= 5.0.0ubuntu6): 5.0.0ubuntu20
is in 10.04 LTS and this is an essential package, so no more need for
the versioned dependency.