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

[Christian Perrier]

Author: bubulle
Date: 2006-05-04 21:47:32 +0000 (Thu, 04 May 2006)
New Revision: 973

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Revert previous cosmetic changes:
-unsure about wrapped line support
-the versioned dependency supposedly required for settitle is unclear


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-04 21:28:25 UTC (rev 972)
+++ trunk/debian/changelog	2006-05-04 21:47:32 UTC (rev 973)
@@ -5,9 +5,6 @@
   * debian/control
     - Updated to Standards: 3.7.2.0 (checked, no change needed: we were
       already compliant)
-    - Wrap long fields as authorized by the policy now
-    - Versioned dependency on debconf for passwd as we use "settitle" in
-      the configuration script. Thanks, lintian
   * Debconf translation updates:
     - Dutch translation updated. Closes: #363690
   * Debian specific fixes:

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-05-04 21:28:25 UTC (rev 972)
+++ trunk/debian/control	2006-05-04 21:47:32 UTC (rev 973)
@@ -4,23 +4,13 @@
 Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
 Standards-Version: 3.7.2.0
 Uploaders: Christian Perrier <bubulle at debian.org>, Martin Quinson <mquinson at debian.org>
-Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev,
- texinfo, file, debhelper (>= 4.1.16), po-debconf,
- libpam-runtime (>= 0.76-14), quilt, dpkg-dev (>= 1.13.5), xsltproc,
- docbook-xsl, docbook-xml, libxml2-utils, cdbs,
- libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
 
 Package: passwd
 Architecture: any
-Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15.2),
- debconf (>= 1.3.22) | cdebconf (>= 0.43)
+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,
- 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
+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, 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
 Description: change and administer password and group data
@@ -33,16 +23,8 @@
 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)
-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
+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)
+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
 Priority: required