-
Committer:
Bazaar Package Importer
-
Author(s):
Dustin Kirkland
-
Date:
2008-12-04 12:09:35 UTC
-
mfrom:
(1.1.13 upstream)
(8.2.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081204120935-vdqggsu1eeb4x83v
Tags: 67-1ubuntu1
* Merge from debian unstable, remaining changes (Debian Bug: #506172):
- debian/ecryptfs-utils.postinst: handle pam-auth-update
- debian/rules:keep the dpatch infrastructure around as we'll likely need
it again; install the pam-auth-update file
- debian/ecryptfs-utils.install: install the pam-auth-update file
- debian/control: keep the dpatch build dep; libpam-runtime dep for
pam-auth-update
- debian/ecryptfs-utils.pam-auth-update: pam stack configuration
- debian/ecryptfs-utils.dirs: usr share install dirs
- debian/ecryptfs-utils.prerm: remove pam-auth-update configuration
* Dropped changes
- debian/patches/10-counter_increment_fix.dpatch: included upstream
- debian/ecryptfs-mount-private.desktop: included upstream
- debian/ecryptfs-mount-private.txt: included upstream
- debian/rules: desktop, readme files installed by upstream
- debian/ecryptfs-utils.install: desktop, readme installed by upstream