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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-11-06 12:55:54 +0000 (Sun, 06 Nov 2011)
New Revision: 3959

Removed:
   trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.lintian-overrides
   trunk/ctdb/debian/patches/series
Log:
new lintian override: ctdb: script-not-executable etc/ctdb/events.d/40.fs_use


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

Modified: trunk/ctdb/debian/ctdb.lintian-overrides
===================================================================
--- trunk/ctdb/debian/ctdb.lintian-overrides	2011-11-06 12:47:01 UTC (rev 3958)
+++ trunk/ctdb/debian/ctdb.lintian-overrides	2011-11-06 12:55:54 UTC (rev 3959)
@@ -3,4 +3,5 @@
 # executable bit
 ctdb: script-not-executable etc/ctdb/events.d/20.multipathd
 ctdb: script-not-executable etc/ctdb/events.d/31.clamd
+ctdb: script-not-executable etc/ctdb/events.d/40.fs_use
 ctdb: script-not-executable etc/ctdb/events.d/60.ganesha

Deleted: trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff
===================================================================
--- trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff	2011-11-06 12:47:01 UTC (rev 3958)
+++ trunk/ctdb/debian/patches/99-fix-broken-readdir-test.diff	2011-11-06 12:55:54 UTC (rev 3959)
@@ -1,68 +0,0 @@
-Goal: Fix broken readdir
-
-See http://bugs.debian.org/603155
-
-Author: Lorenzo De Liso <blackz at ubuntu.com>?
-
-Upstream status: https://bugzilla.samba.org/show_bug.cgi?id=7032
-
-diff -Naurp ctdb-1.0.108.orig/configure ctdb-1.0.108/configure
---- ctdb-1.0.108.orig/configure	2009-12-10 09:31:44.000000000 -0500
-+++ ctdb-1.0.108/configure	2010-01-12 09:30:45.991761240 -0500
-@@ -8139,7 +8139,7 @@ else
- /* end confdefs.h.  */
- 
- #define test_readdir_os2_delete main
--#include "$libreplacedir/test/os2_delete.c"
-+#include "$libreplacedir/tests/os2_delete.c"
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-   libreplace_cv_READDIR_NEEDED=no
-@@ -8273,7 +8273,7 @@ else
- #define _LIBREPLACE_REPLACE_H
- #include "$libreplacedir/repdir_getdirentries.c"
- #define test_readdir_os2_delete main
--#include "$libreplacedir/test/os2_delete.c"
-+#include "$libreplacedir/tests/os2_delete.c"
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-   libreplace_cv_READDIR_GETDIRENTRIES=yes
-@@ -8334,7 +8334,7 @@ else
- #error _donot_use_getdents_replacement_anymore
- #include "$libreplacedir/repdir_getdents.c"
- #define test_readdir_os2_delete main
--#include "$libreplacedir/test/os2_delete.c"
-+#include "$libreplacedir/tests/os2_delete.c"
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-   libreplace_cv_READDIR_GETDENTS=yes
-diff -Naurp ctdb-1.0.108.orig/lib/replace/repdir.m4 ctdb-1.0.108/lib/replace/repdir.m4
---- ctdb-1.0.108.orig/lib/replace/repdir.m4	2009-12-10 09:31:41.000000000 -0500
-+++ ctdb-1.0.108/lib/replace/repdir.m4	2010-01-12 09:31:17.261761034 -0500
-@@ -1,7 +1,7 @@
- AC_CACHE_CHECK([for broken readdir],libreplace_cv_READDIR_NEEDED,[
- 	AC_TRY_RUN([
- #define test_readdir_os2_delete main
--#include "$libreplacedir/test/os2_delete.c"],
-+#include "$libreplacedir/tests/os2_delete.c"],
- 	[libreplace_cv_READDIR_NEEDED=no],
- 	[libreplace_cv_READDIR_NEEDED=yes],
- 	[libreplace_cv_READDIR_NEEDED="assuming not"])
-@@ -34,7 +34,7 @@ AC_CACHE_CHECK([for replacing readdir us
- #define _LIBREPLACE_REPLACE_H
- #include "$libreplacedir/repdir_getdirentries.c"
- #define test_readdir_os2_delete main
--#include "$libreplacedir/test/os2_delete.c"],
-+#include "$libreplacedir/tests/os2_delete.c"],
- 	[libreplace_cv_READDIR_GETDIRENTRIES=yes],
- 	[libreplace_cv_READDIR_GETDIRENTRIES=no])
- ])
-@@ -57,7 +57,7 @@ AC_CACHE_CHECK([for replacing readdir us
- #error _donot_use_getdents_replacement_anymore
- #include "$libreplacedir/repdir_getdents.c"
- #define test_readdir_os2_delete main
--#include "$libreplacedir/test/os2_delete.c"],
-+#include "$libreplacedir/tests/os2_delete.c"],
- 	[libreplace_cv_READDIR_GETDENTS=yes],
- 	[libreplace_cv_READDIR_GETDENTS=no])
- ])

Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	2011-11-06 12:47:01 UTC (rev 3958)
+++ trunk/ctdb/debian/patches/series	2011-11-06 12:55:54 UTC (rev 3959)
@@ -2,4 +2,3 @@
 05-hurd.diff
 10_no-lib64.diff
 92-apache-service-enable.diff
-99-fix-broken-readdir-test.diff