[Pkg-shadow-commits] r866 - in trunk: . debian

[Christian Perrier]

Author: bubulle
Date: 2006-02-20 19:14:47 +0000 (Mon, 20 Feb 2006)
New Revision: 866

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/dependencies
Log:
Stop replacing manpages-it


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-14 13:28:58 UTC (rev 865)
+++ trunk/debian/changelog	2006-02-20 19:14:47 UTC (rev 866)
@@ -4,6 +4,9 @@
   * Upstream bugs or fixes not already fixed in upstream releases or CVS:
     - 467_useradd_-r_LSB: add a "-r" option for adding system users
       for LSB compatibility. Closes: #333706
+  * Debian packaging fixes:
+    - Stop replacing manpages-it as a new release of that package removed
+      the conflicting manpages
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 14 Feb 2006 14:21:43 +0100
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-02-14 13:28:58 UTC (rev 865)
+++ trunk/debian/control	2006-02-20 19:14:47 UTC (rev 866)
@@ -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, 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, 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, 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

Modified: trunk/dependencies
===================================================================
--- trunk/dependencies	2006-02-14 13:28:58 UTC (rev 865)
+++ trunk/dependencies	2006-02-20 19:14:47 UTC (rev 866)
@@ -63,7 +63,7 @@
 ================
  * manpages (<=1.15-2)
    before bo
- * 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
+ * manpages-de (<< 0.4-9), manpages-fi, manpages-fr (<<1.64.0-1), manpages-hu, 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
    Some of the passwd man pages are also distributed in some manpages* packages.
    Look at the debian/02/run test to optimize these dependencies.
    NOTE: Not all maintainers have been notified.