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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-05-26 22:26:34 +0000 (Sat, 26 May 2007)
New Revision: 1412

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/control.in
Log:
samba and swat should both depend directly on update-inetd, because
update-inetd is the package that provides the update-inetd (some
implementations of inet-superserver do *not* depend on update-inetd!).

swat also needs to depend on openbsd-inetd | inet-superserver, because the
superserver is basic to swat's functionality; for samba, it's a Suggests:
only because inetd is not used by this package by default.

Also make the same changes to debian/control.in, so they don't get
overwritten later by a refresh.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-05-26 17:45:01 UTC (rev 1411)
+++ trunk/samba/debian/changelog	2007-05-26 22:26:34 UTC (rev 1412)
@@ -1,5 +1,6 @@
 samba (3.0.25a-1) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
   * New upstream version
   * Bugs fixed upstream:
     - password expiration loog on samba domain controllers. Closes: #425083
@@ -9,20 +10,23 @@
       on shares with "force group". Closes: #424629
   * Debian packaging fixes:
     - Enforce building with "--with-ads" and therefore fail
-      when the build can't be done with kerberos support. 
+      when the build can't be done with kerberos support.
       Closes: #424637
     - 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
       patch. Closes: #425640
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 19 May 2007 09:00:56 +0200
+  [ Steve Langasek ]
+  * swat and samba depend on update-inetd instead of on netbase; swat also
+    depends on "openbsd-inetd | inet-superserver", for samba this is only a
+    Suggests.
 
+ -- Steve Langasek <vorlon at debian.org>  Sat, 26 May 2007 15:21:36 -0700
+
 samba (3.0.25-1) unstable; urgency=high
 
   * New upstream version including security fixes

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2007-05-26 17:45:01 UTC (rev 1411)
+++ trunk/samba/debian/control	2007-05-26 22:26:34 UTC (rev 1412)
@@ -10,8 +10,9 @@
 
 Package: samba
 Architecture: any
-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
+Depends: samba-common (= ${Source-Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd
 Recommends: smbldap-tools
+Suggests: openbsd-inetd | inet-superserver
 Replaces: samba-common (<= 2.0.5a-2)
 Description: a LanManager-like file and printer server for Unix
  The Samba software suite is a collection of programs that
@@ -80,7 +81,7 @@
 
 Package: swat
 Architecture: any
-Depends: samba (= ${Source-Version}), samba-doc (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
+Depends: samba (= ${Source-Version}), samba-doc (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, update-inetd, 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

Modified: trunk/samba/debian/control.in
===================================================================
--- trunk/samba/debian/control.in	2007-05-26 17:45:01 UTC (rev 1411)
+++ trunk/samba/debian/control.in	2007-05-26 22:26:34 UTC (rev 1412)
@@ -10,8 +10,9 @@
 
 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, update-inetd
 Recommends: smbldap-tools
+Suggests: openbsd-inetd | inet-superserver
 Replaces: samba-common (<= 2.0.5a-2)
 Description: a LanManager-like file and printer server for Unix
  The Samba software suite is a collection of programs that
@@ -77,7 +78,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}, update-inetd, 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