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

[Christian Perrier]

Author: bubulle
Date: 2005-10-04 20:56:29 +0000 (Tue, 04 Oct 2005)
New Revision: 565

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
manpages-hu has fixed the conflict in 20010119-3


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-04 17:39:17 UTC (rev 564)
+++ trunk/debian/changelog	2005-10-04 20:56:29 UTC (rev 565)
@@ -14,6 +14,8 @@
                            removed
       - manpages-de:       versioned Replaces as the man pages have now been
                            removed
+      - manpages-hu:       versioned Replaces as the man pages have now been
+                           removed
     - debian/rules:
       - pack upstream's NEWS file into login and passwd. Closes: #331487
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-10-04 17:39:17 UTC (rev 564)
+++ trunk/debian/control	2005-10-04 20:56:29 UTC (rev 565)
@@ -10,7 +10,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${loginpam}
 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, 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, manpages-ko, 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, 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, manpages-ja, manpages-pl (<= 20020406-1), manpages-de (<< 0.4-9), manpages-es-extra (<< 0.8a-14)
 Essential: yes
 Section: admin
 Priority: required