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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-11-06 13:00:42 +0000 (Sun, 06 Nov 2011)
New Revision: 3960

Removed:
   trunk/ctdb/debian/patches/92-apache-service-enable.diff
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/series
Log:
removed 92-apache-service-enable.diff: integrated

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-11-06 12:55:54 UTC (rev 3959)
+++ trunk/ctdb/debian/changelog	2011-11-06 13:00:42 UTC (rev 3960)
@@ -1,8 +1,8 @@
 ctdb (1.11+git20111102-1) UNRELEASED; urgency=low
 
   * New upstream release
-    - updated 92-apache-service-enable.diff
-    - removed 99-fix-broken-readdir-test.diff: integrated 
+    - removed 92-apache-service-enable.diff: integrated 
+    - removed 99-fix-broken-readdir-test.diff: integrated
   * Don't use /use/lib64 on ppc64 (Closes: #644907)
   * d/rules: converted to dh7 
 

Deleted: trunk/ctdb/debian/patches/92-apache-service-enable.diff
===================================================================
--- trunk/ctdb/debian/patches/92-apache-service-enable.diff	2011-11-06 12:55:54 UTC (rev 3959)
+++ trunk/ctdb/debian/patches/92-apache-service-enable.diff	2011-11-06 13:00:42 UTC (rev 3960)
@@ -1,21 +0,0 @@
-Goal: Fix httpd (i.e. apache2 service) activation
-
-(Closes: #635136)
-
-Author: Mathieu Parent <math.parent at gmail.com>
-
-Upstream status: to be sent
-
-Index: ctdb-1.0.112-12/config/events.d/41.httpd
-===================================================================
---- a/config/events.d/41.httpd
-+++ b/config/events.d/41.httpd
-@@ -42,7 +42,7 @@ loadconfig
- 
- ctdb_start_stop_service
- 
--is_ctdb_managed_service || exit 0
-+is_ctdb_managed_service httpd || exit 0
- 
- ctdb_service_check_reconfigure
- 

Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	2011-11-06 12:55:54 UTC (rev 3959)
+++ trunk/ctdb/debian/patches/series	2011-11-06 13:00:42 UTC (rev 3960)
@@ -1,4 +1,3 @@
 02_ctdb_diagnostics.diff
 05-hurd.diff
 10_no-lib64.diff
-92-apache-service-enable.diff