diff -Nru ganglia-modules-linux-1.3.6/debian/changelog ganglia-modules-linux-1.3.6/debian/changelog --- ganglia-modules-linux-1.3.6/debian/changelog 2021-01-17 10:43:42.000000000 +0000 +++ ganglia-modules-linux-1.3.6/debian/changelog 2021-07-11 22:22:06.000000000 +0000 @@ -1,3 +1,9 @@ +ganglia-modules-linux (1.3.6-5) unstable; urgency=medium + + * Fix multiarch support in *.conf files (Closes: #990808). + + -- Marcos Fouces Mon, 12 Jul 2021 00:22:06 +0200 + ganglia-modules-linux (1.3.6-4) unstable; urgency=medium * Remove version requirement for libganglia1-dev as 3.3.5 is older than diff -Nru ganglia-modules-linux-1.3.6/debian/rules ganglia-modules-linux-1.3.6/debian/rules --- ganglia-modules-linux-1.3.6/debian/rules 2021-01-17 10:43:42.000000000 +0000 +++ ganglia-modules-linux-1.3.6/debian/rules 2021-07-11 22:22:06.000000000 +0000 @@ -2,13 +2,20 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = $(shell apr-1-config --cflags --cppflags --includes) -I/usr/include/tirpc/ export DEB_LDFLAGS_MAINT_APPEND = -ltirpc +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh $@ -override_dh_auto_install: +override_dh_auto_install: debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_fs.conf-sample debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_io.conf debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_multicpu.conf-sample dh_auto_install - cp conf.d/mod_fs.conf debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_fs.conf-sample - cp conf.d/mod_io.conf debian/ganglia-modules-linux/etc/ganglia/conf.d - cp conf.d/mod_multicpu.conf debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_multicpu.conf-sample find debian/ \( -name "*.la" -o -name "*.a" -o -name "modmulticpu.so" \) -delete + +debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_fs.conf-sample: conf.d/mod_fs.conf + sed 's/usr\/lib\/ganglia/usr\/lib\/$(DEB_HOST_MULTIARCH)\/ganglia/g' $< > $@ + +debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_io.conf: conf.d/mod_io.conf + sed 's/usr\/lib\/ganglia/usr\/lib\/$(DEB_HOST_MULTIARCH)\/ganglia/g' $< > $@ + +debian/ganglia-modules-linux/etc/ganglia/conf.d/mod_multicpu.conf-sample: conf.d/mod_multicpu.conf + sed 's/usr\/lib\/ganglia/usr\/lib\/$(DEB_HOST_MULTIARCH)\/ganglia/g' $< > $@