From 4b9dbe2a46daf673f070ffb508a4e5187ac8f23b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 19 Jan 2017 16:39:47 +0100 Subject: [PATCH] make multiarch install dirs --- debian/guh-plugins-maker.dirs | 1 - debian/guh-plugins-maker.dirs.in | 1 + debian/guh-plugins-maker.install | 5 ---- debian/guh-plugins-maker.install.in | 5 ++++ debian/guh-plugins-merkur.dirs | 1 - debian/guh-plugins-merkur.dirs.in | 1 + debian/guh-plugins-merkur.install | 5 ---- debian/guh-plugins-merkur.install.in | 5 ++++ debian/guh-plugins.dirs | 1 - debian/guh-plugins.dirs.in | 1 + debian/guh-plugins.install.in | 23 +++++++++++++++++++ debian/guh-tests.dirs.in | 1 + debian/guh-tests.install | 7 ------ debian/guh-tests.install.in | 7 ++++++ debian/libguh1-dev.dirs | 2 -- debian/libguh1-dev.dirs.in | 2 ++ ...uh1-dev.install => libguh1-dev.install.in} | 2 +- debian/libguh1.dirs | 1 - debian/libguh1.dirs.in | 1 + debian/libguh1.install | 3 --- debian/libguh1.install.in | 3 +++ debian/rules | 7 ++++-- 22 files changed, 56 insertions(+), 29 deletions(-) delete mode 100644 debian/guh-plugins-maker.dirs create mode 100644 debian/guh-plugins-maker.dirs.in delete mode 100644 debian/guh-plugins-maker.install create mode 100644 debian/guh-plugins-maker.install.in delete mode 100644 debian/guh-plugins-merkur.dirs create mode 100644 debian/guh-plugins-merkur.dirs.in delete mode 100644 debian/guh-plugins-merkur.install create mode 100644 debian/guh-plugins-merkur.install.in delete mode 100644 debian/guh-plugins.dirs create mode 100644 debian/guh-plugins.dirs.in create mode 100644 debian/guh-plugins.install.in create mode 100644 debian/guh-tests.dirs.in delete mode 100644 debian/guh-tests.install create mode 100644 debian/guh-tests.install.in delete mode 100644 debian/libguh1-dev.dirs create mode 100644 debian/libguh1-dev.dirs.in rename debian/{libguh1-dev.install => libguh1-dev.install.in} (65%) delete mode 100644 debian/libguh1.dirs create mode 100644 debian/libguh1.dirs.in delete mode 100644 debian/libguh1.install create mode 100644 debian/libguh1.install.in diff --git a/debian/guh-plugins-maker.dirs b/debian/guh-plugins-maker.dirs deleted file mode 100644 index 0a803bb8..00000000 --- a/debian/guh-plugins-maker.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/guh/plugins diff --git a/debian/guh-plugins-maker.dirs.in b/debian/guh-plugins-maker.dirs.in new file mode 100644 index 00000000..2661877e --- /dev/null +++ b/debian/guh-plugins-maker.dirs.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins diff --git a/debian/guh-plugins-maker.install b/debian/guh-plugins-maker.install deleted file mode 100644 index 8d199fee..00000000 --- a/debian/guh-plugins-maker.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/guh/plugins/libguh_devicepluginlircd.so -usr/lib/guh/plugins/libguh_deviceplugincommandlauncher.so -usr/lib/guh/plugins/libguh_devicepluginudpcommander.so -usr/lib/guh/plugins/libguh_devicepluginavahimonitor.so -usr/lib/guh/plugins/libguh_deviceplugingpio.so diff --git a/debian/guh-plugins-maker.install.in b/debian/guh-plugins-maker.install.in new file mode 100644 index 00000000..68d17c59 --- /dev/null +++ b/debian/guh-plugins-maker.install.in @@ -0,0 +1,5 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginlircd.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugincommandlauncher.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginudpcommander.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginavahimonitor.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugingpio.so diff --git a/debian/guh-plugins-merkur.dirs b/debian/guh-plugins-merkur.dirs deleted file mode 100644 index 0a803bb8..00000000 --- a/debian/guh-plugins-merkur.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/guh/plugins diff --git a/debian/guh-plugins-merkur.dirs.in b/debian/guh-plugins-merkur.dirs.in new file mode 100644 index 00000000..2661877e --- /dev/null +++ b/debian/guh-plugins-merkur.dirs.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins diff --git a/debian/guh-plugins-merkur.install b/debian/guh-plugins-merkur.install deleted file mode 100644 index 98b26a30..00000000 --- a/debian/guh-plugins-merkur.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/guh/plugins/libguh_devicepluginosdomotics.so -usr/lib/guh/plugins/libguh_deviceplugindollhouse.so -usr/lib/guh/plugins/libguh_devicepluginplantcare.so -usr/lib/guh/plugins/libguh_devicepluginws2812.so -usr/lib/guh/plugins/libguh_devicepluginorderbutton.so diff --git a/debian/guh-plugins-merkur.install.in b/debian/guh-plugins-merkur.install.in new file mode 100644 index 00000000..4e4d2673 --- /dev/null +++ b/debian/guh-plugins-merkur.install.in @@ -0,0 +1,5 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginosdomotics.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugindollhouse.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginplantcare.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginws2812.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginorderbutton.so diff --git a/debian/guh-plugins.dirs b/debian/guh-plugins.dirs deleted file mode 100644 index 0a803bb8..00000000 --- a/debian/guh-plugins.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/guh/plugins diff --git a/debian/guh-plugins.dirs.in b/debian/guh-plugins.dirs.in new file mode 100644 index 00000000..2661877e --- /dev/null +++ b/debian/guh-plugins.dirs.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins diff --git a/debian/guh-plugins.install.in b/debian/guh-plugins.install.in new file mode 100644 index 00000000..9997fa26 --- /dev/null +++ b/debian/guh-plugins.install.in @@ -0,0 +1,23 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginconrad.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginnetworkdetector.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginelro.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugineq3.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginintertechno.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginlgsmarttv.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginmailnotification.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginopenweathermap.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginphilipshue.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginwakeonlan.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginwemo.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugindatetime.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginunitec.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginleynew.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginkodi.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginelgato.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginawattar.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginnetatmo.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugindenon.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginsenic.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginmultisensor.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginpushbullet.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginusbwde.so diff --git a/debian/guh-tests.dirs.in b/debian/guh-tests.dirs.in new file mode 100644 index 00000000..b37cfd92 --- /dev/null +++ b/debian/guh-tests.dirs.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@/guh/tests diff --git a/debian/guh-tests.install b/debian/guh-tests.install deleted file mode 100644 index f88fe5d2..00000000 --- a/debian/guh-tests.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/tests/* usr/lib/guh/tests -usr/lib/libguh-core.so -usr/lib/libguh-core.so.1 -usr/lib/libguh-core.so.1.0 -usr/lib/libguh-core.so.1.0.0 -usr/lib/guh/plugins/libguh_devicepluginmock.so -usr/lib/guh/plugins/libguh_deviceplugingenericelements.so diff --git a/debian/guh-tests.install.in b/debian/guh-tests.install.in new file mode 100644 index 00000000..998c6957 --- /dev/null +++ b/debian/guh-tests.install.in @@ -0,0 +1,7 @@ +usr/tests/* usr/lib/@DEB_HOST_MULTIARCH@/guh/tests +usr/lib/@DEB_HOST_MULTIARCH@/libguh-core.so +usr/lib/@DEB_HOST_MULTIARCH@/libguh-core.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libguh-core.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libguh-core.so.1.0.0 +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_devicepluginmock.so +usr/lib/@DEB_HOST_MULTIARCH@/guh/plugins/libguh_deviceplugingenericelements.so diff --git a/debian/libguh1-dev.dirs b/debian/libguh1-dev.dirs deleted file mode 100644 index 39326de9..00000000 --- a/debian/libguh1-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/* -usr/include/guh diff --git a/debian/libguh1-dev.dirs.in b/debian/libguh1-dev.dirs.in new file mode 100644 index 00000000..54a4a9f8 --- /dev/null +++ b/debian/libguh1-dev.dirs.in @@ -0,0 +1,2 @@ +usr/lib/@DEB_HOST_MULTIARCH@ +usr/include/guh diff --git a/debian/libguh1-dev.install b/debian/libguh1-dev.install.in similarity index 65% rename from debian/libguh1-dev.install rename to debian/libguh1-dev.install.in index c8bd6471..a8859a4b 100644 --- a/debian/libguh1-dev.install +++ b/debian/libguh1-dev.install.in @@ -1,4 +1,4 @@ -usr/lib/*/libguh.so +usr/lib/@DEB_HOST_MULTIARCH@/libguh.so usr/include/guh/* usr/include/guh usr/bin/guh-generateplugininfo usr/bin diff --git a/debian/libguh1.dirs b/debian/libguh1.dirs deleted file mode 100644 index f1d0181f..00000000 --- a/debian/libguh1.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/* diff --git a/debian/libguh1.dirs.in b/debian/libguh1.dirs.in new file mode 100644 index 00000000..cb180229 --- /dev/null +++ b/debian/libguh1.dirs.in @@ -0,0 +1 @@ +usr/lib/@DEB_HOST_MULTIARCH@ diff --git a/debian/libguh1.install b/debian/libguh1.install deleted file mode 100644 index b4315226..00000000 --- a/debian/libguh1.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libguh.so.1 -usr/lib/*/libguh.so.1.0 -usr/lib/*/libguh.so.1.0.0 diff --git a/debian/libguh1.install.in b/debian/libguh1.install.in new file mode 100644 index 00000000..052aa34e --- /dev/null +++ b/debian/libguh1.install.in @@ -0,0 +1,3 @@ +usr/lib/@DEB_HOST_MULTIARCH@/libguh.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libguh.so.1.0 +usr/lib/@DEB_HOST_MULTIARCH@/libguh.so.1.0.0 diff --git a/debian/rules b/debian/rules index 26e9a5de..9ff7ea00 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,12 @@ else endif DPKG_EXPORT_BUILDFLAGS = 1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -include /usr/share/dpkg/buildflags.mk +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +PREPROCESS_FILES := $(wildcard debian/*.in) + +$(PREPROCESS_FILES:.in=): %: %.in + sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@ %: dh $@ --buildsystem=qmake --parallel