[Pkg-samba-maint] Differences between control and control.in in svn trunk

[Peter Eisentraut]

There are some differences between control and control.in in the svn
trunk, besides the obvious @libacl@ substitution.  I haven't thought
hard enough to determine whether this affects the build, but it should
be fixed at least for clarity's sake.


--- control.in  2005-12-03 12:36:30.000000000 +0100
+++ control     2005-12-03 12:33:11.000000000 +0100
@@ -3,13 +3,12 @@
 Priority: optional
 Maintainer: Eloy A. Paris <peloy at debian.org>
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>
-Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9)
+Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9)
 Standards-Version: 3.6.2

 Package: samba
 Architecture: any
 Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6)
-Recommends: smbldap-tools
 Replaces: samba-common (<= 2.0.5a-2)
 Suggests: samba-doc
 Description: a LanManager-like file and printer server for Unix
@@ -128,7 +127,7 @@
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${Source-Version})
+Depends: ${shlibs:Depends}
 Suggests: samba
 Description: pluggable authentication module for SMB password database
  This is a stackable PAM module that allows a system administrator to easily
@@ -166,7 +165,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version})
 Replaces: samba (<= 2.2.3-2)
 Description: service to resolve user and group information from Windows NT servers
  This package provides the winbindd daemon, which provides a