[Pkg-samba-maint] [samba] 01/06: Fix CTDB build with PMDA

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch experimental
in repository samba.

commit ce027835cc1cb843d2fe59e2caeb84c622a4c943
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Jun 24 20:58:20 2015 +0200

    Fix CTDB build with PMDA
    
    As suggested by Martin Schwenke at https://lists.samba.org/archive/samba-technical/2015-June/108108.html
---
 ctdb/wscript                                  |  2 +-
 debian/patches/Fix-CTDB-build-with-PMDA.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ctdb/wscript b/ctdb/wscript
index 2239e1f..f95dcfa 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -417,7 +417,7 @@ def build(bld):
         bld.SAMBA_BINARY('pmdactdb',
                          source='utils/pmda/pmda_ctdb.c',
                          includes='include include/internal',
-                         deps='''ctdb-client ctdb-common ctdb-system
+                         deps='''ctdb-common-util ctdb-client ctdb-common ctdb-system
                                  pcp_pmda pcp''',
                          install_path='${CTDB_PMDADIR}')
         bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/Install',
diff --git a/debian/patches/Fix-CTDB-build-with-PMDA.patch b/debian/patches/Fix-CTDB-build-with-PMDA.patch
new file mode 100644
index 0000000..525c237
--- /dev/null
+++ b/debian/patches/Fix-CTDB-build-with-PMDA.patch
@@ -0,0 +1,26 @@
+From 036bccc2827f0e3fda3a5d1b593286aa942546de Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Wed, 24 Jun 2015 20:58:20 +0200
+Subject: [PATCH] Fix CTDB build with PMDA
+
+As suggested by Martin Schwenke at https://lists.samba.org/archive/samba-technical/2015-June/108108.html
+---
+ ctdb/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ctdb/wscript b/ctdb/wscript
+index 2239e1f..f95dcfa 100755
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -417,7 +417,7 @@ def build(bld):
+         bld.SAMBA_BINARY('pmdactdb',
+                          source='utils/pmda/pmda_ctdb.c',
+                          includes='include include/internal',
+-                         deps='''ctdb-client ctdb-common ctdb-system
++                         deps='''ctdb-common-util ctdb-client ctdb-common ctdb-system
+                                  pcp_pmda pcp''',
+                          install_path='${CTDB_PMDADIR}')
+         bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/Install',
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index c50006d..ae2e2c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ xsltproc_dont_build_smb.conf.5.patch
 heimdal-rfc3454.txt
 no_wrapper
 ctdb_sockpath.patch
+Fix-CTDB-build-with-PMDA.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git