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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-10-13 20:44:15 +0000 (Thu, 13 Oct 2005)
New Revision: 607

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/login.defs
Log:
Tighten the Replaces fields (thanks to tests/debian/02/run).
Fix a typo in debian/login.defs.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-13 20:39:16 UTC (rev 606)
+++ trunk/debian/changelog	2005-10-13 20:44:15 UTC (rev 607)
@@ -1,6 +1,14 @@
 shadow (1:4.0.13-2) UNRELEASED; urgency=low
 
   * The "Pouligny St-Pierre" release
+  * Debian packaging fixes:
+    - debian/control:
+      - manpages-ja: versioned Replaces as the man pages have now been
+                     removed
+      - manpages-ko: versioned Replaces as the man pages have now been
+                     removed
+    - debian/login.defs:
+      - fix a typo.
 
  -- Christian Perrier <bubulle at debian.org>  Thu, 13 Oct 2005 20:21:36 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-10-13 20:39:16 UTC (rev 606)
+++ trunk/debian/control	2005-10-13 20:44:15 UTC (rev 607)
@@ -10,7 +10,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15)
 Conflicts: shadow-passwd, pam-apps, suidregister (<< 0.50), debconf (<< 0.5)
-Replaces: manpages (<=1.15-2), manpages-de (<< 0.4-9), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-3), manpages-it, manpages-ja, manpages-ko, manpages-pl (<= 20020406-1), manpages-es-extra (<< 0.8a-14), manpages-ru (<< 0.98-3),manpages-zh
+Replaces: manpages (<=1.15-2), manpages-de (<< 0.4-9), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-3), manpages-it, manpages-ja (<< 0.5.0.0.20050915-1), manpages-ko (<< 20010901-0.1), manpages-pl (<= 20020406-1), manpages-es-extra (<< 0.8a-14), manpages-ru (<< 0.98-3), manpages-zh
 Section: admin
 Priority: required
 Description: change and administer password and group data
@@ -24,7 +24,7 @@
 Pre-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Depends: libpam-modules (>= 0.72-5)
 Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50)
-Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-3), manpages-it, manpages-ko, manpages-ja, manpages-pl (<= 20020406-1), manpages-de (<< 0.4-9), manpages-es-extra (<< 0.8a-14)
+Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-3), manpages-it, manpages-ko (<< 20010901-0.1), manpages-ja (<< 0.5.0.0.20050915-1), manpages-pl (<= 20020406-1), manpages-de (<< 0.4-9), manpages-es-extra (<< 0.8a-14)
 Essential: yes
 Section: admin
 Priority: required

Modified: trunk/debian/login.defs
===================================================================
--- trunk/debian/login.defs	2005-10-13 20:39:16 UTC (rev 606)
+++ trunk/debian/login.defs	2005-10-13 20:44:15 UTC (rev 607)
@@ -191,8 +191,8 @@
 #
 # Max number of login retries if password is bad. This will most likely be
 # overriden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries However, this is a safe fallback in case you are using
-# and authentication module that does not enforce PAM_MAXTRIES.
+# in of 3 retries. However, this is a safe fallback in case you are using
+# an authentication module that does not enforce PAM_MAXTRIES.
 #
 LOGIN_RETRIES		5