[mate-sensors-applet] 01/03: debian/{control, rules, mate-sensors-applet.install}: Switch to far more elegant dh-exec based approach when it comes to installing arch-specific files into our bin:package(s).

Vangelis Mouhtsis gnugr-guest at moszumanska.debian.org
Tue Aug 29 16:02:44 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 0ee5316ebfce18a58a45b15e1d42f520f6daec19
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 29 16:58:31 2017 +0200

    debian/{control,rules,mate-sensors-applet.install}: Switch to far more elegant dh-exec based approach when it comes to installing arch-specific files into our bin:package(s).
---
 debian/control                     |  1 +
 debian/mate-sensors-applet.install |  6 ++++++
 debian/rules                       | 13 -------------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 9304f62..672393e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders: Mike Gabriel <sunweaver at debian.org>,
            Vangelis Mouhtsis <vangelis at gnugr.org>,
            Martin Wimpress <code at flexion.org>,
 Build-Depends: debhelper (>= 10.3~),
+               dh-exec,
                docbook-xml,
                dpkg-dev (>= 1.16.1.1),
                intltool,
diff --git a/debian/mate-sensors-applet.install b/debian/mate-sensors-applet.install
old mode 100644
new mode 100755
index 6cadcc2..64cef38
--- a/debian/mate-sensors-applet.install
+++ b/debian/mate-sensors-applet.install
@@ -1,3 +1,5 @@
+#! /usr/bin/dh-exec
+
 usr/lib/*/mate-sensors-applet/plugins/libacpi.so
 usr/lib/*/mate-sensors-applet/plugins/libeee.so
 usr/lib/*/mate-sensors-applet/plugins/libhddtemp.so
@@ -8,6 +10,10 @@ 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
+[linux-any] usr/lib/*/mate-sensors-applet/plugins/liblibsensors.so
+[linux-any] usr/lib/*/mate-sensors-applet/plugins/libudisks.so
+[kfreebsd-any] usr/lib/*/mate-sensors-applet/plugins/libi2c-proc.so
+[kfreebsd-any] usr/lib/*/mate-sensors-applet/plugins/libi2c-sys.so
 usr/lib/mate-sensors-applet/
 usr/share/dbus-1/
 usr/share/mate-panel/applets/
diff --git a/debian/rules b/debian/rules
index 28b3b92..9aeaf2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,21 +20,8 @@ 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
 
-	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
 	dh_auto_configure $(DHFLAGS) -- \

-- 
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