[Pkg-samba-maint] r2008 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

tags 478800 pending
thanks

Author: bubulle
Date: 2008-07-06 07:50:31 +0000 (Sun, 06 Jul 2008)
New Revision: 2008

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/samba.init
Log:
Merge r1928

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-07-06 07:44:05 UTC (rev 2007)
+++ branches/samba/experimental/debian/changelog	2008-07-06 07:50:31 UTC (rev 2008)
@@ -29,6 +29,10 @@
   * Update copyright and README.debian information for current and past
     maintainers. Remove redundant mention of Tridge (the copyright is enough)
   * Add doc-base files for samba-doc-pdf. Closes: #451685
+  * add a soft dependency on slapd in init script to allow
+    proper operation when dependency-based boot sequence is enabled.
+    Thanks to Petter Reinholdtsen for reporting and providing a patch
+    Closes: #478800
 
   [ Debconf translations ]
   * Kurdish. Closes: #480151

Modified: branches/samba/experimental/debian/samba.init
===================================================================
--- branches/samba/experimental/debian/samba.init	2008-07-06 07:44:05 UTC (rev 2007)
+++ branches/samba/experimental/debian/samba.init	2008-07-06 07:50:31 UTC (rev 2008)
@@ -6,6 +6,8 @@
 # Required-Stop:     $network $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
+# Should-Start:      slapd
+# Should-Stop:       slapd
 # Short-Description: start Samba daemons (nmbd and smbd)
 ### END INIT INFO