[Pkg-shadow-commits] r1936 - debian/trunk/debian

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-28 20:18:50 +0000 (Fri, 28 Mar 2008)
New Revision: 1936

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/control
   debian/trunk/debian/rules
Log:
Simplify the dependencies:
login (>= 970502-1) was already provided by login in Hamm.
libpam-modules (>= 0.72-5) was already provided by libpam-modules in Potato.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-03-27 18:57:31 UTC (rev 1935)
+++ debian/trunk/debian/changelog	2008-03-28 20:18:50 UTC (rev 1936)
@@ -36,6 +36,9 @@
   * 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) <nicolas.francois at centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100
 

Modified: debian/trunk/debian/control
===================================================================
--- debian/trunk/debian/control	2008-03-27 18:57:31 UTC (rev 1935)
+++ debian/trunk/debian/control	2008-03-28 20:18:50 UTC (rev 1936)
@@ -9,7 +9,7 @@
 
 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 @@
 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

Modified: debian/trunk/debian/rules
===================================================================
--- debian/trunk/debian/rules	2008-03-27 18:57:31 UTC (rev 1935)
+++ debian/trunk/debian/rules	2008-03-28 20:18:50 UTC (rev 1936)
@@ -89,8 +89,3 @@
 	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