[Pkg-samba-maint] [samba] 02/02: Disable CTDB PMDA untill fixed upstream

[Mathieu Parent]

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

sathieu pushed a commit to branch no_pmda
in repository samba.

commit 3930fafd96b6709a7f9c5ccc61cc48c28ca4b64a
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Wed Jun 24 14:03:12 2015 +0200

    Disable CTDB PMDA untill fixed upstream
    
    See https://lists.samba.org/archive/samba-technical/2015-June/108107.html
---
 debian/control               | 16 ----------------
 debian/ctdb-pcp-pmda.install |  1 -
 debian/rules                 |  3 +--
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 6c362c0..2880afe 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Build-Depends: bison,
                libpam0g-dev,
                libparse-yapp-perl,
                libpcap-dev [hurd-i386 kfreebsd-any],
-               libpcp-pmda3-dev,
-               libpcp3-dev,
                libpopt-dev,
                libreadline-dev,
                libsubunit-dev,
@@ -625,17 +623,3 @@ Description: clustered database to store temporary data -- debugging symbols and
  .
  This package provides debugging information and test suite for CTDB. Install it
  to get a better backtrace in the event of a crash, or to test.
-
-Package: ctdb-pcp-pmda
-Architecture: any
-Depends: ctdb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: clustered database to store temporary data -- PDM PMDA
- CTDB is a cluster implementation of the TDB database used by Samba and other
- projects to store temporary data. If an application is already using TDB for
- temporary data it is very easy to convert that application to be cluster aware
- and use CTDB instead.
- .
- More detailed description can be found in the ctdb package.
- .
- This package provides PCP-PMDA (Performance Co-Pilot - Performance Metric
- Domain Agents) support for CTDB.
diff --git a/debian/ctdb-pcp-pmda.install b/debian/ctdb-pcp-pmda.install
deleted file mode 100644
index ca03d52..0000000
--- a/debian/ctdb-pcp-pmda.install
+++ /dev/null
@@ -1 +0,0 @@
-/var/lib/pcp/pmdas/ctdb/*
diff --git a/debian/rules b/debian/rules
index 6af1808..199220d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,8 +35,7 @@ endif
 ctdb_conf_args = \
 		--localstatedir=/var \
 		--with-socketpath=/var/run/ctdb/ctdbd.socket \
-		--with-logdir=/var/log/ctdb \
-		--enable-pmda
+		--with-logdir=/var/log/ctdb
 
 conf_args = \
 		--prefix=/usr \

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