[Pkg-samba-maint] r2998 - in trunk/ctdb/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-08-23 11:35:53 +0000 (Sun, 23 Aug 2009)
New Revision: 2998

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/control
   trunk/ctdb/debian/patches/50-fix-bashism.diff
Log:
Added "time" to Depends. This remove part of 50-fix-bashism.diff


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-08-23 11:28:02 UTC (rev 2997)
+++ trunk/ctdb/debian/changelog	2009-08-23 11:35:53 UTC (rev 2998)
@@ -12,8 +12,9 @@
   * Bump Standards-Version to 3.8.3: no changes
   * 30_outdated-autotools.diff: Correct outdated config.{sub,guess}
     (Closes: #536256)
+  * Added "time" to Depends. This remove part of 50-fix-bashism.diff 
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 23 Aug 2009 13:27:53 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 23 Aug 2009 13:35:54 +0200
 
 ctdb (1.0.85-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control	2009-08-23 11:28:02 UTC (rev 2997)
+++ trunk/ctdb/debian/control	2009-08-23 11:35:53 UTC (rev 2998)
@@ -12,7 +12,7 @@
 
 Package: ctdb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, iproute [!hurd-i386], psmisc, tdb-tools
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, iproute [!hurd-i386], psmisc, tdb-tools, time
 Recommends: ethtool
 Suggests: logrotate, lsof
 Description: clustered database to store temporary data

Modified: trunk/ctdb/debian/patches/50-fix-bashism.diff
===================================================================
--- trunk/ctdb/debian/patches/50-fix-bashism.diff	2009-08-23 11:28:02 UTC (rev 2997)
+++ trunk/ctdb/debian/patches/50-fix-bashism.diff	2009-08-23 11:35:53 UTC (rev 2998)
@@ -6,23 +6,6 @@
 
 Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=6407
 
-Index: b/config/events.d/00.ctdb
-===================================================================
---- a/config/events.d/00.ctdb
-+++ b/config/events.d/00.ctdb
-@@ -27,7 +27,11 @@
- # periodic vacuum function
- periodic_vacuum() {
-     # this cleans up dead records and repacks the databases
--    ( time ctdb vacuum 200000 -T 30; time ctdb repack -T 30 ) > $CTDB_BASE/state/vacuum.log 2>&1 &
-+    if [ "$(command -v time)" ]; then
-+        ( time ctdb vacuum 200000 -T 30; time ctdb repack -T 30 ) > $CTDB_BASE/state/vacuum.log 2>&1 &
-+    else
-+        ( ctdb vacuum 200000 -T 30; ctdb repack -T 30 ) > $CTDB_BASE/state/vacuum.log 2>&1 &
-+    fi
- }
- 
- case $cmd in 
 Index: b/config/events.d/11.natgw
 ===================================================================
 --- a/config/events.d/11.natgw