diff --git a/debian/changelog b/debian/changelog index 1dd0e8b7..70c74c35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,9 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low * debian/watch: Add a watch file for shadow. * debian/rules, debian/recode_manpages.sh: Do not recode the manpages. Keep them in UTF-8. + * debian/rules, debian/control: login (>= 970502-1) was already provided + by login in Hamm. libpam-modules (>= 0.72-5) was already provided by + libpam-modules in Potato. Simplify the dependencies. -- Nicolas FRANCOIS (Nekral) Sun, 24 Feb 2008 18:33:31 +0100 diff --git a/debian/control b/debian/control index 15b25814..bb8be6ff 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/trunk Package: passwd Architecture: any -Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15.2) +Depends: ${shlibs:Depends}, login, libpam-modules, debianutils (>= 2.15.2) Replaces: manpages-de (<< 0.4-9), manpages-fi (<< 0.2-4), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it (<< 0.3.4-3), manpages-ja (<< 0.5.0.0.20050915-1), manpages-ko (<< 20050219-2), manpages-es (<< 1.55-4), manpages-es-extra (<< 0.8a-15), manpages-ru (<< 0.98-3), manpages-tr, manpages-zh Section: admin Priority: required @@ -22,7 +22,7 @@ Description: change and administer password and group data Package: login Architecture: any Pre-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) -Depends: libpam-modules (>= 0.72-5) +Depends: libpam-modules Conflicts: gnunet (<< 0.7.0c-2), amavisd-new (<<2.3.3-8), python-4suite (<< 0.99cvs20060405-1), backupninja (<< 0.9.3-5), echolot (<< 2.1.8-4) Replaces: manpages-fi (<< 0.2-4), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it (<< 0.3.4-2), manpages-ko (<< 20050219-2), manpages-ja (<< 0.5.0.0.20050915-1), manpages-de, manpages-es-extra (<<0.8a-15), manpages-tr, manpages-zh Essential: yes diff --git a/debian/rules b/debian/rules index b255884d..0505629b 100755 --- a/debian/rules +++ b/debian/rules @@ -89,8 +89,3 @@ binary-predeb/passwd:: chgrp shadow debian/passwd/usr/bin/expiry chmod g+s debian/passwd/usr/bin/chage chmod g+s debian/passwd/usr/bin/expiry -ifeq ($(DEB_HOST_ARCH_OS),hurd) - echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars -else - echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars -endif