[Debian-ha-maintainers] Bug#650820: FTBFS on kfreebsd-amd64

[Robert Millan]

Package: cluster-glue
Version: 1.0.8-3
Severity: important
Tags: patch
User: debian-bsd at lists.debian.org
Usertags: kfreebsd

cluster-glue fails to build on kfreebsd-amd64 because it attempts to build
a Linux-specific daemon unconditionally.

(there are no build logs of this because of missing build-dependency, see
#650816)

Please consider attached patch to fix this problem.

-- System Information:
Debian Release: 6.0.3
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 8.1-1-amd64
Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------
=== modified file 'debian/cluster-glue.install'
--- debian/cluster-glue.install	2011-12-03 12:45:17 +0000
+++ debian/cluster-glue.install	2011-12-03 13:21:57 +0000
@@ -37,7 +37,6 @@ usr/lib/stonith/plugins/stonith2/wti_mpc
 var/*
 usr/sbin/stonith
 usr/sbin/meatclient
-usr/sbin/sbd
 usr/sbin/lrmadmin
 usr/sbin/ha_logger
 usr/sbin/hb_report

=== modified file 'debian/control'
--- debian/control	2011-12-03 12:45:17 +0000
+++ debian/control	2011-12-03 14:16:03 +0000
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Sch?ler <fs at debian.org>
-Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltproc, docbook-xsl, chrpath, docbook-xml, libdbus-glib-1-dev, libdbus-1-dev, help2man
+Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, inetutils-ping, python, psmisc, libnet1-dev, iproute [linux-any], libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltproc, docbook-xsl, chrpath, docbook-xml, libdbus-glib-1-dev, libdbus-1-dev, help2man
 Standards-Version: 3.9.1
 Homepage: http://hg.linux-ha.org/glue/
 Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
@@ -145,6 +145,14 @@ Description: The reusable cluster compon
  utility, and other reusable cluster components from
  the Linux HA project.
 
+Package: ha-sbd
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: cluster-glue
+Description: Shared storage fencing tool
+ This package contains the shared storage fencing daemon from
+ the Linux HA project.
+
 Package: cluster-glue-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, liblrm2-dev (= ${binary:Version}), libpils2-dev (= ${binary:Version}), libplumb2-dev (= ${binary:Version}), libplumbgpl2-dev (= ${binary:Version}), libstonith1-dev (= ${binary:Version})

=== added file 'debian/ha-sbd.install'
--- debian/ha-sbd.install	1970-01-01 00:00:00 +0000
+++ debian/ha-sbd.install	2011-12-03 14:16:23 +0000
@@ -0,0 +1 @@
+usr/sbin/sbd