[Debian-ha-commits] [cluster-glue] 01/02: Fix B-D and dh_install for hurd and kfreebsd.

[Christoph Berg]

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

myon pushed a commit to branch master
in repository cluster-glue.

commit 32c6f755d15e562d5625831ee4aaa67049a063f1
Author: Christoph Berg <myon at debian.org>
Date:   Sat Mar 26 09:46:15 2016 +0100

    Fix B-D and dh_install for hurd and kfreebsd.
---
 debian/changelog         |  6 ++++++
 debian/control           |  6 +++---
 debian/libplumb2.symbols |  6 +++++-
 debian/rules             | 14 +++++++++++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 621fc83..322b611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cluster-glue (1.0.12-3) UNRELEASED; urgency=medium
+
+  * Fix B-D and dh_install for hurd and kfreebsd.
+
+ -- Christoph Berg <myon at debian.org>  Fri, 25 Mar 2016 22:10:07 +0100
+
 cluster-glue (1.0.12-2) unstable; urgency=medium
 
   * Remove old transitional packages libcluster-glue and libcluster-glue-dev.
diff --git a/debian/control b/debian/control
index 1e25922..e64dbbf 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Build-Depends: debhelper (>= 9),
  docbook-xml,
  flex,
  help2man,
- iputils-ping,
- libaio-dev,
+ inetutils-ping | iputils-ping,
+ libaio-dev [linux-any],
  libbz2-dev,
  libcurl4-openssl-dev | libcurl3-openssl-dev,
  libdbus-glib-1-dev,
@@ -43,7 +43,7 @@ Build-Depends: debhelper (>= 9),
  python-dev (>= 2.6.6-3~),
  python (>= 2.6.6-3~),
  swig,
- systemd,
+ systemd [linux-any],
  uuid-dev,
  xsltproc,
  zlib1g-dev
diff --git a/debian/libplumb2.symbols b/debian/libplumb2.symbols
index 6363e60..79ea996 100644
--- a/debian/libplumb2.symbols
+++ b/debian/libplumb2.symbols
@@ -46,6 +46,7 @@ libplumb.so.2 libplumb2 #MINVER#
  RemoveTrackedProcTimeouts at Base 0
  ReportProcHasDied at Base 0
  SetTrackedProcTimeouts at Base 0
+ (arch=hurd-i386)add_longclock at Base 1.0.12
  base64_to_binary at Base 0
  binary_to_base64 at Base 0
  bytes_for_int at Base 0
@@ -138,7 +139,7 @@ libplumb.so.2 libplumb2 #MINVER#
  cl_perror at Base 0
  cl_poll at Base 0
  cl_poll_ignore at Base 0
- cl_poll_setsig at Base 0
+ (arch=!hurd-i386)cl_poll_setsig at Base 0
  cl_randseed at Base 0
  cl_read_pidfile at Base 0
  cl_read_pidfile_no_checking at Base 0
@@ -178,6 +179,7 @@ libplumb.so.2 libplumb2 #MINVER#
  cl_uuid_is_null at Base 0
  cl_uuid_parse at Base 0
  cl_uuid_unparse at Base 0
+ (arch=hurd-i386)cmp_longclock at Base 1.0.12
  compose_netstring at Base 0
  convert_nl_sym at Base 0
  debug_level at Base 0
@@ -242,6 +244,7 @@ libplumb.so.2 libplumb2 #MINVER#
  is_auth_netstring at Base 0
  is_compressed_msg at Base 0
  list_cleanup at Base 0
+ (arch=hurd-i386)longclockto_long at Base 1.0.12
  longclockto_ms at Base 0
  mkstemp_mode at Base 0
  msg2ipcchan at Base 0
@@ -306,6 +309,7 @@ libplumb.so.2 libplumb2 #MINVER#
  struct_display_print_spaces at Base 0
  struct_netstringlen at Base 0
  struct_stringlen at Base 0
+ (arch=hurd-i386)sub_longclock at Base 1.0.12
  time_longclock at Base 0
  wirefmt2ipcmsg at Base 0
  wirefmt2msg at Base 0
diff --git a/debian/rules b/debian/rules
index 4e96235..7252e71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,11 +30,19 @@ override_dh_auto_install:
 		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 	done
 
-ifeq (hurd,$(shell dpkg-architecture -qDEB_HOST_ARCH_OS))
-EXCLUDE=-Xbladehpi -Xipmilan
+DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+FAIL_MISSING=--fail-missing
 endif
 override_dh_install:
-	dh_install --fail-missing $(EXCLUDE)
+# we should probably use dh_install -X here, but it doesn't work
+ifeq (hurd,$(DEB_HOST_ARCH_OS))
+	sed -i -e'/bladehpi/d' -e '/ipmilan/d' -e '/systemd/d' debian/*.install
+endif
+ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
+	sed -i -e '/systemd/d' debian/*.install
+endif
+	dh_install $(FAIL_MISSING)
 
 override_dh_installinit:
 	dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git