[Pkg-samba-maint] r929 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-10 01:23:44 +0000 (Tue, 10 Jan 2006)
New Revision: 929

Modified:
   branches/samba4/changelog
   branches/samba4/control
Log:
Replace debconf dependencies with ${misc:Depends}, to automatically get the
debconf-2.0 alternative right.



Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-10 00:56:53 UTC (rev 928)
+++ branches/samba4/changelog	2006-01-10 01:23:44 UTC (rev 929)
@@ -5,7 +5,8 @@
     * Make samba-common replace/conflict samba (<= 3.9.0+SVN12739-1).
   * Make samba-clients depend on samba-common.
   * Make samba-common depend on debconf.
-  * Make all debconf dependencies have debconf-2.0 as a valid alternative.
+  * Replace debconf dependencies with ${misc:Depends}, to automatically
+    get the debconf-2.0 alternative right.
   * Include the newuser binary in samba-server package.
   * Add missing Build-Depends on: libgnutls-dev, libreadline5-dev,
     libpam0g-dev. All were causing silent build failures (ie. the package

Modified: branches/samba4/control
===================================================================
--- branches/samba4/control	2006-01-10 00:56:53 UTC (rev 928)
+++ branches/samba4/control	2006-01-10 01:23:44 UTC (rev 929)
@@ -9,7 +9,7 @@
 Package: samba
 Architecture: any
 Recommends: swat, ldb-tools
-Depends: ${shlibs:Depends}, samba-common, debconf | debconf-2.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common
 Replaces: samba-common (<= 3.9.0+SVN12726-1)
 Description: LanManager-like file and printer server for Unix (version 4)
  The Samba software suite is a collection of programs that
@@ -28,7 +28,7 @@
 Architecture: any
 Replaces: samba (<= 3.9.0+SVN12739-1)
 Conflicts: samba (<= 3.9.0+SVN12739-1)
-Depends: debconf | debconf-2.0
+Depends: ${misc:Depends}
 Description: Samba 4 common files used by both the server and the client
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve