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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-02-21 23:10:57 +0000 (Tue, 21 Feb 2006)
New Revision: 874

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
manpages-hu removed the conflicting pages.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-21 23:09:26 UTC (rev 873)
+++ trunk/debian/changelog	2006-02-21 23:10:57 UTC (rev 874)
@@ -9,8 +9,8 @@
       This fix issues in passwd, chage, chfn and chsh when /proc is not
       mounted. Closes: #352494
   * Debian packaging fixes:
-    - Stop replacing manpages-it as a new release of that package removed
-      the conflicting manpages
+    - Stop replacing manpages-it (login only, newusers is still conflicting on
+      passwd) and manpages-hu as new releases removed the conflicting manpages
     - passwd.config:
       Better POSIX compliance and avoid failure if root password is set to '!'
       Thanks to Vagrant Cascadian for reporting and providing the patch

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-02-21 23:09:26 UTC (rev 873)
+++ trunk/debian/control	2006-02-21 23:10:57 UTC (rev 874)
@@ -10,7 +10,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15.2)
 Conflicts: shadow-passwd, pam-apps, suidregister (<< 0.50), debconf (<< 0.5)
-Replaces: manpages (<=1.15-2), manpages-de (<< 0.4-9), manpages-fi, manpages-fr (<<1.64.0-1), manpages-hu, manpages-it, manpages-ja (<< 0.5.0.0.20050915-1), manpages-ko, manpages-pl (<= 20020406-1), manpages-es, manpages-es-extra, manpages-ru (<< 0.98-3), manpages-tr, manpages-zh
+Replaces: manpages (<=1.15-2), manpages-de (<< 0.4-9), manpages-fi, manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it, manpages-ja (<< 0.5.0.0.20050915-1), manpages-ko, manpages-pl (<= 20020406-1), manpages-es, manpages-es-extra, manpages-ru (<< 0.98-3), manpages-tr, 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-fi, manpages-fr (<<1.64.0-1), manpages-hu, manpages-it (<< 0.3.4-2), manpages-ko, manpages-ja (<< 0.5.0.0.20050915-1), manpages-pl (<= 20020406-1), manpages-de, manpages-es-extra, manpages-tr, manpages-zh
+Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fi, manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it (<< 0.3.4-2), manpages-ko, manpages-ja (<< 0.5.0.0.20050915-1), manpages-pl (<= 20020406-1), manpages-de, manpages-es-extra, manpages-tr, manpages-zh
 Essential: yes
 Section: admin
 Priority: required