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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2012-02-04 13:56:01 +0000 (Sat, 04 Feb 2012)
New Revision: 4007

Added:
   trunk/ctdb/debian/patches/
   trunk/ctdb/debian/patches/0001-Load-platform-dependent-objs-instead-of-Linux-one.patch
   trunk/ctdb/debian/patches/series
Modified:
   trunk/ctdb/debian/changelog
Log:
Load platform dependent objs instead of Linux one

Hopefully, this will fix FTBFS on kFreeBSD and GNU/Hurd

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2012-02-02 19:02:36 UTC (rev 4006)
+++ trunk/ctdb/debian/changelog	2012-02-04 13:56:01 UTC (rev 4007)
@@ -1,3 +1,11 @@
+ctdb (1.12+git20120201-2) unstable; urgency=low
+
+  * 0001-Load-platform-dependent-objs-instead-of-Linux-one.patch:
+    Load platform dependent objs instead of Linux one.
+    Hopefully, this will fix FTBFS on kFreeBSD and GNU/Hurd 
+
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 04 Feb 2012 14:51:14 +0100
+
 ctdb (1.12+git20120201-1) unstable; urgency=low
 
   * New upstream snapshot

Added: trunk/ctdb/debian/patches/0001-Load-platform-dependent-objs-instead-of-Linux-one.patch
===================================================================
--- trunk/ctdb/debian/patches/0001-Load-platform-dependent-objs-instead-of-Linux-one.patch	                        (rev 0)
+++ trunk/ctdb/debian/patches/0001-Load-platform-dependent-objs-instead-of-Linux-one.patch	2012-02-04 13:56:01 UTC (rev 4007)
@@ -0,0 +1,61 @@
+From c3eb61991373667f5f94410b044e6c3dba8ce2c6 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Sat, 4 Feb 2012 14:32:06 +0100
+Subject: [PATCH] Load platform dependent objs instead of Linux one
+
+This fix compilation on Gnu/Hurd and kFreeBSD
+
+See also:
+https://buildd.debian.org/status/fetch.php?pkg=ctdb&arch=hurd-i386&ver=1.12%2Bgit20120201-1&stamp=1328211119
+https://buildd.debian.org/status/fetch.php?pkg=ctdb&arch=kfreebsd-amd64&ver=1.12%2Bgit20120201-1&stamp=1328214761
+https://buildd.debian.org/status/fetch.php?pkg=ctdb&arch=kfreebsd-i386&ver=1.12%2Bgit20120201-1&stamp=1328215875
+---
+ Makefile.in            |    2 +-
+ tests/src/ctdb_test.c  |    3 ---
+ tests/src/ctdbd_test.c |    3 ---
+ 3 files changed, 1 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2dd2bb7..0e6a88d 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -240,7 +240,7 @@ CTDBD_TEST_C = $(CTDB_SERVER_MOST_OBJ:.o=.c) tests/src/ctdbd_test.c
+ CTDB_TEST_C = $(CTDB_CLIENT_OBJ:.o=.c) tools/ctdb.c tools/ctdb_vacuum.c  tests/src/ctdb_test.c
+ 
+ CTDB_TEST_OBJ =  @TALLOC_OBJ@ @TDB_OBJ@ \
+-	@LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ)
++	@CTDB_SYSTEM_OBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) @TEVENT_OBJ@ $(SOCKET_WRAPPER_OBJ)
+ 
+ tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
+ 
+diff --git a/tests/src/ctdb_test.c b/tests/src/ctdb_test.c
+index 533f3f4..f3c7de3 100644
+--- a/tests/src/ctdb_test.c
++++ b/tests/src/ctdb_test.c
+@@ -48,9 +48,6 @@
+ #include "common/cmdline.c"
+ #include "lib/util/debug.c"
+ #include "common/rb_tree.c"
+-#ifdef _LINUX_ERRNO_H
+-#include "common/system_linux.c"
+-#endif
+ #include "common/system_common.c"
+ #include "common/ctdb_logging.c"
+ 
+diff --git a/tests/src/ctdbd_test.c b/tests/src/ctdbd_test.c
+index 1e72f48..19861ff 100644
+--- a/tests/src/ctdbd_test.c
++++ b/tests/src/ctdbd_test.c
+@@ -53,9 +53,6 @@ void ctdb_load_nodes_file(struct ctdb_context *ctdb) {}
+ #include "common/cmdline.c"
+ #include "lib/util/debug.c"
+ #include "common/rb_tree.c"
+-#ifdef _LINUX_ERRNO_H
+-#include "common/system_linux.c"
+-#endif
+ #include "common/system_common.c"
+ #include "common/ctdb_logging.c"
+ 
+-- 
+1.7.8.3
+

Added: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	                        (rev 0)
+++ trunk/ctdb/debian/patches/series	2012-02-04 13:56:01 UTC (rev 4007)
@@ -0,0 +1 @@
+0001-Load-platform-dependent-objs-instead-of-Linux-one.patch