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

[Christian Perrier]

Author: bubulle
Date: 2007-04-15 12:24:09 +0000 (Sun, 15 Apr 2007)
New Revision: 1164

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Clean out the Conflicts lines, removing packages that are only in pre-sarge
versions


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-04-15 12:16:08 UTC (rev 1163)
+++ trunk/debian/changelog	2007-04-15 12:24:09 UTC (rev 1164)
@@ -7,6 +7,10 @@
     regular operations.  Closes: #406046
     - Versioned Build-Depends on gnome-doc-utils as we use the "-l"
       switch of xml2po. Closes: #390110
+    - Remove conflicts for packages that are only in Debian releases prior
+      to sarge:
+      - passwd: shadow-passwd, pam-apps, suidregister (<< 0.50), debconf (<< 0.5)
+      - login: shadow-login, pam-apps, secure-su, suidregister (<< 0.50)
   * Upstream bugs not yet fixed in upstream releases or CVS:
     - 493_pwck_no_SHADOWPWD: SHADOWPWD no more exist.
       pwck do not detect missing users in /etc/shadow.

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-04-15 12:16:08 UTC (rev 1163)
+++ trunk/debian/control	2007-04-15 12:24:09 UTC (rev 1164)
@@ -10,7 +10,6 @@
 Package: passwd
 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 (<< 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-pl (<= 20020406-1), manpages-es (<< 1.55-4), manpages-es-extra (<< 0.8a-15), manpages-ru (<< 0.98-3), manpages-tr, manpages-zh
 Section: admin
 Priority: required
@@ -24,7 +23,7 @@
 Architecture: any
 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), 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)
+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: shadow-login, shadow-passwd, shellutils (<< 2.0-2), 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-pl (<= 20020406-1), manpages-de (<< 0.4-10), manpages-es-extra (<<0.8a-15), manpages-tr, manpages-zh
 Essential: yes
 Section: admin