[Pkg-samba-maint] r1409 - trunk/samba/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-05-26 12:00:10 +0000 (Sat, 26 May 2007)
New Revision: 1409

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
swat and samba depend on openbsd-inetd | inet-superserver and no longer
netbase. The netbase dependency was added only because postinst scripts use
update-inetd.


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-05-26 10:10:21 UTC (rev 1408)
+++ trunk/samba/debian/changelog	2007-05-26 12:00:10 UTC (rev 1409)
@@ -11,9 +11,11 @@
     - Enforce building with "--with-ads" and therefore fail
       when the build can't be done with kerberos support. 
       Closes: #424637
-    - debian/control wrap long lines in packages' descriptions
+    - debian/control: wrap long lines in packages' descriptions
   * Merge Ubuntu changes:
     - use of PIDDIR instead of hardcoding it in samba.init and winbind.init
+    - swat and samba depend on "openbsd-inetd | inet-superserver" and 
+      no longer netbase (Ubuntu hardcodes this to update-inetd)
   * Patches to upstream source:
     - patches/fhs.patch: recreate winbindd_cache.tdb in the cache directory
       instead of the lock directory. Thanks to C. K. Jester-Young for the

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2007-05-26 10:10:21 UTC (rev 1408)
+++ trunk/samba/debian/control	2007-05-26 12:00:10 UTC (rev 1409)
@@ -10,7 +10,7 @@
 
 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), procps
+Depends: samba-common (= ${Source-Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, openbsd-inetd | inet-superserver
 Recommends: smbldap-tools
 Replaces: samba-common (<= 2.0.5a-2)
 Description: a LanManager-like file and printer server for Unix
@@ -80,7 +80,7 @@
 
 Package: swat
 Architecture: any
-Depends: samba (= ${Source-Version}), samba-doc (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, netbase
+Depends: samba (= ${Source-Version}), samba-doc (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
 Description: Samba Web Administration Tool
  The Samba software suite is a collection of programs that
  implements the SMB/CIFS protocol for unix systems, allowing you to serve