[mate-sensors-applet] 03/04: debian/rules: Fix FTBFS on kfreebsd and possibly on hurd architectures.
Vangelis Mouhtsis
gnugr-guest at moszumanska.debian.org
Thu Aug 24 07:53:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
gnugr-guest pushed a commit to branch parrot/3.7
in repository mate-sensors-applet.
commit 39bcdf5a99fccb80892633a1a5c08c73a63a8b4c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Aug 23 16:50:10 2017 +0200
debian/rules: Fix FTBFS on kfreebsd and possibly on hurd architectures.
- On kfreebsd and hurd exclude liblibsensors.so and libudisks.so plugin,
as it does not get built there.
- On kfreebsd include libi2c-proc.so and libi2c-sys.so.
---
debian/mate-sensors-applet.install | 2 --
debian/rules | 22 ++++++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/debian/mate-sensors-applet.install b/debian/mate-sensors-applet.install
index adafc8a..6cadcc2 100644
--- a/debian/mate-sensors-applet.install
+++ b/debian/mate-sensors-applet.install
@@ -3,13 +3,11 @@ usr/lib/*/mate-sensors-applet/plugins/libeee.so
usr/lib/*/mate-sensors-applet/plugins/libhddtemp.so
usr/lib/*/mate-sensors-applet/plugins/libi8k.so
usr/lib/*/mate-sensors-applet/plugins/libibm-acpi.so
-usr/lib/*/mate-sensors-applet/plugins/liblibsensors.so
usr/lib/*/mate-sensors-applet/plugins/libmbmon.so
usr/lib/*/mate-sensors-applet/plugins/libomnibook.so
usr/lib/*/mate-sensors-applet/plugins/libpmu-sys.so
usr/lib/*/mate-sensors-applet/plugins/libsmu-sys.so
usr/lib/*/mate-sensors-applet/plugins/libsonypi.so
-usr/lib/*/mate-sensors-applet/plugins/libudisks.so
usr/lib/mate-sensors-applet/
usr/share/dbus-1/
usr/share/mate-panel/applets/
diff --git a/debian/rules b/debian/rules
index 707b3c1..28b3b92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,7 @@
DHFLAGS=--parallel
-DH_INSTALL_EXCLUDES=
DEB_BUILD_ARCH_OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-ifneq (,$(filter kfreebsd,$(DEB_BUILD_ARCH_OS)))
-DH_INSTALL_EXCLUDES = --exclude liblibsensors.so --exclude libudisks.so
-endif
-ifneq (,$(filter hurd,$(DEB_BUILD_ARCH_OS)))
-DH_INSTALL_EXCLUDES = --exclude liblibsensors.so --exclude libudisks.so
-endif
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
@@ -27,7 +20,20 @@ override_dh_install:
rm -rfv debian/tmp/usr/lib/*/mate-sensors-applet/plugins/*.a
rm -rfv debian/tmp/usr/lib/*/mate-sensors-applet/plugins/*.la
- dh_install $(DH_INSTALL_EXCLUDES)
+ cp debian/mate-sensors-applet.install debian/mate-sensors-applet.install.debbak
+ if [ "x$(DEB_BUILD_ARCH_OS)" != "xhurd" ] && [ "x$(DEB_BUILD_ARCH_OS)" != "xkfreebsd" ]; then \
+ echo "usr/lib/*/mate-sensors-applet/plugins/liblibsensors.so" >> debian/mate-sensors-applet.install; \
+ echo "usr/lib/*/mate-sensors-applet/plugins/libudisks.so" >> debian/mate-sensors-applet.install; \
+ elif [ "x$(DEB_BUILD_ARCH_OS)" = "xkfreebsd" ]; then \
+ echo "usr/lib/*/mate-sensors-applet/plugins/libi2c-proc.so" >> debian/mate-sensors-applet.install; \
+ echo "usr/lib/*/mate-sensors-applet/plugins/libi2c-sys.so" >> debian/mate-sensors-applet.install; \
+ fi
+
+ dh_install
+
+ if [ -e "debian/mate-sensors-applet.install.debbak" ]; then \
+ mv debian/mate-sensors-applet.install.debbak debian/mate-sensors-applet.install; \
+ fi
override_dh_auto_configure:
NOCONFIGURE=1 ./autogen.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-sensors-applet.git
More information about the pkg-mate-commits
mailing list