[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#991073: marked as done (unblock: ganglia-modules-linux/1.3.4-5)

Your message dated Sun, 18 Jul 2021 09:19:45 +0200
with message-id <CAM8zJQt5-KarAnRTGGExMw5qehhVoTnTCtCqJxY7FYH2KWm29g@mail.gmail.com>
and subject line Re: Bug#991073: unblock: ganglia-modules-linux/1.3.4-5
has caused the Debian Bug report #991073,
regarding unblock: ganglia-modules-linux/1.3.4-5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
991073: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991073
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ganglia-modules-linux

[ Reason ]
Configs path are wrong. Users must manually fix the configuration
files for all modules contained in this package.

Upstream uses "/usr/lib/ganglia" as path for all cases. Debian package
support multiarch, so paths must be adapted for each architecture, for
example "/usr/lib/x86_64-linux-gnu/ganglia" for amd64.

Modules are properly allocated at install time but the values in config
files are wrong.

This fix is done via dpkg-architecture DEB_HOST_MULTIARCH in d/rules
file. There is no other change as you can check in the diff.

[ Other info ]
I still not uploaded the package to sid waiting for aproval.

unblock ganglia-modules-linux/1.3.4-5


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 11:43:42.000000000 +0100
+++ ganglia-modules-linux-1.3.6/debian/changelog	2021-07-12 00:22:06.000000000 +0200
@@ -1,3 +1,9 @@
+ganglia-modules-linux (1.3.6-5) unstable; urgency=medium
+
+  * Fix multiarch support in *.conf files (Closes: #990808).
+
+ -- Marcos Fouces <marcos@debian.org>  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 11:43:42.000000000 +0100
+++ ganglia-modules-linux-1.3.6/debian/rules	2021-07-12 00:22:06.000000000 +0200
@@ -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' $< > $@

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: