Bug#989507: unblock: collectd/5.12.0-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package collectd
[ Reason ]
Fixing
#968950
collectd-dev: missing meta_data.h header file included by plugin.h
[ Impact ]
Building c plugins for collectd is not possible anymore.
[ Tests ]
There are header files being shipped again. No tests for that.
[ Risks ]
Plugins still fail to build. I have nothing to test that
unfortunately. Otherwise - no changes, so no risks.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
unblock collectd/5.12.0-6
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff --git a/debian/changelog b/debian/changelog
index 74daf54..c6a6057 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+collectd (5.12.0-6) unstable; urgency=medium
+
+ * [b4e7861] collectd-dev: Add missing header files again.
+ Thanks to Benjamin Drung (Closes: #968950)
+ * [3261aa1] Also create necessary directories
+ * [6c0c6be] Fix target location in dh_install
+
+ -- Bernd Zeimetz <bzed@debian.org> Tue, 01 Jun 2021 17:56:33 +0200
+
collectd (5.12.0-5) unstable; urgency=medium
* [11ee08b] Disable tokyotyrant.
diff --git a/debian/collectd-dev.install b/debian/collectd-dev.install
index a3dd678..ffd3f5f 100644
--- a/debian/collectd-dev.install
+++ b/debian/collectd-dev.install
@@ -1,4 +1,3 @@
src/liboconfig/oconfig.h usr/include/collectd/liboconfig
-src/*.h usr/include/collectd/core
-src/daemon/*.h usr/include/collectd/core/daemon
+usr/include/collectd/core
diff --git a/debian/rules b/debian/rules
index 5cf4804..ad8880f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -275,17 +275,24 @@ install-indep:
dh_testroot
dh_prep
dh_installdirs -i
- dh_install -i
+ set -e ;\
+ find src -path src/libcollectdclient -prune -o -path src/liboconfig -prune -o -name '*.h' -print | while read i; do \
+ d=$$(echo "$${i}" | sed 's,^src,debian/tmp/usr/include/collectd/core,') ;\
+ mkdir -p $$(echo "$${i}" | sed -e 's,^src,debian/tmp/usr/include/collectd/core,' -e 's,/[^/]*$$,,') ;\
+ cp "$${i}" "$${d}" ;\
+ done
+
+ dh_install -i
+
# update include path for collectd header files
( set -e; \
cd $(CURDIR)/debian/collectd-dev/usr/include/collectd/; \
- for lib in $$(find . -type f -name '*.h'); do \
+ headers=$$(find . -type f -name '*.h'); \
+ for lib in $$headers; do \
libname=$$(basename $$lib); \
fullpath=$$(echo $$lib | sed -r -e 's,^\./,collectd/,'); \
- for dir in $$(find . -mindepth 1 -type d); do \
- sed -r -i -e "s,(include\s+)\".*\<$$libname\",\1\"$$fullpath\"," $$dir/*.h; \
- done; \
+ sed -r -i -e "s,(include\s+)\".*\<$$libname\",\1\"$$fullpath\"," $$headers; \
done )
install-arch: build
@@ -299,9 +306,9 @@ install-arch: build
rm -f debian/tmp/usr/lib/collectd/*.la
rm -f debian/tmp/usr/lib/libcollectdclient.la
rm -f debian/tmp/etc/collectd.conf
-
+
dh_install -a --sourcedir=$(CURDIR)/debian/tmp --fail-missing
-
+
perl ./debian/bin/gen_plugin_deps.pl
mkdir -p debian/collectd-core/usr/share/lintian/overrides/
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second set of .debs but not in first
---------------------------------------------
-rw-r--r-- root/root /usr/include/collectd/core/utils/avltree/avltree.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/cmds.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/flush.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/getthreshold.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/getval.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/listval.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/parse_option.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/putnotif.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/cmds/putval.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/common/common.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/config_cores/config_cores.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/crc32/crc32.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/curl_stats/curl_stats.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/db_query/db_query.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/deq/deq.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/dmi/dmi.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/dns/dns.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/dpdk/dpdk.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/format_graphite/format_graphite.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/format_json/format_json.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/format_kairosdb/format_kairosdb.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/format_stackdriver/format_stackdriver.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/gce/gce.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/heap/heap.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/ignorelist/ignorelist.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/latency/latency.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/latency/latency_config.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/lookup/vl_lookup.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/match/match.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/message_parser/message_parser.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/metadata/meta_data.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/mount/mount.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/oauth/oauth.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/ovs/ovs.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/proc_pids/proc_pids.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/rrdcreate/rrdcreate.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/tail/tail.h
-rw-r--r-- root/root /usr/include/collectd/core/utils/taskstats/taskstats.h
Control files of package collectd: lines which differ (wdiff format)
--------------------------------------------------------------------
Depends: collectd-core (>= [-5.12.0-5),-] {+5.12.0-6),+} collectd-core (<< [-5.12.0-5.1~),-] {+5.12.0-6.1~),+} libc6 (>= 2.14), librrd8 (>= 1.3.0)
Recommends: intel-cmt-cat (>= 4.1), libatasmart4 (>= 0.13), libbson-1.0-0 (>= [-1.17.3),-] {+1.17.5),+} libc6 (>= 2.29), libcurl3-gnutls (>= 7.18.2-5), libdbi1 (>= 0.9.0), libesmtp6, libgcc-s1 (>= 3.0), libgcrypt20 (>= 1.8.0), libglib2.0-0 (>= 2.12.0), libgps28 (>= 3.3), [-libgrpc++1, libgrpc10,-] {+libgrpc++1 (>= 1.30.2), libgrpc10 (>= 1.30.2),+} libhiredis0.14 (>= 0.14.0), libi2c0 (>= 4.0), libip4tc2 (>= 1.8.3), libip6tc2 (>= 1.8.3), libjansson4 (>= 2.0.1), libldap-2.4-2 (>= 2.4.7), liblua5.3-0, libmariadb3 (>= 3.0.0), libmemcached11, libmicrohttpd12 (>= 0.9.50), libmnl0 (>= 1.0.3-4~), libmodbus5 (>= 3.0.2), libmongoc-1.0-0 (>= [-1.17.3),-] {+1.17.5),+} libmosquitto1 (>= 1.2), libnotify4 (>= 0.7.0), libopenipmi0 (>= 2.0.29), liboping0 (>= 0.3.3), libowcapi-3.2-4 (>= 3.2p4+dfsg1), libpcap0.8 (>= 1.0.0), libperl5.32 (>= 5.32.0~rc1), libpq5, libprotobuf-c1 (>= 1.0.1), libprotobuf23 (>= 3.12.4), libpython3.9 (>= [-3.9.0~b4),-] {+3.9.1),+} libqpid-proton11, librabbitmq4 (>= 0.8.0), librdkafka1 (>= 0.9.1), libriemann-client0 (>= 1.10.0), librrd8 (>= 1.4~rc2), librte-eal21 (>= 20.11), librte-ethdev21 (>= 20.11), libsensors5 (>= 1:3.5.0), libsnmp40 (>= 5.9+dfsg), libssl1.1 (>= 1.1.0), libstdc++6 (>= 5.2), libudev1 (>= 183), libvarnishapi2 (>= 6.1.0), libvirt0 (>= 1.2.11~rc1), libxenmisc4.14, libxml2 (>= 2.7.4), libyajl2 (>= 2.0.4), default-jre-headless
Version: [-5.12.0-5-] {+5.12.0-6+}
Control files of package collectd-core: lines which differ (wdiff format)
-------------------------------------------------------------------------
Suggests: collectd-dev, librrds-perl, liburi-perl, libhtml-parser-perl, libregexp-common-perl, libconfig-general-perl, httpd-cgi, apache2, apcupsd, bind9, ceph, chrony, default-mysql-server, gpsd, hddtemp, iptables, ipvsadm, lm-sensors, mbmon, memcached, nginx, notification-daemon, openvpn, olsrd, pdns-server, postgresql, redis-server, slapd, time-daemon, varnish, zookeeper, intel-cmt-cat (>= 4.1), libatasmart4 (>= 0.13), libbson-1.0-0 (>= [-1.17.3),-] {+1.17.5),+} libc6 (>= 2.29), libcurl3-gnutls (>= 7.18.2-5), libdbi1 (>= 0.9.0), libesmtp6, libgcc-s1 (>= 3.0), libgcrypt20 (>= 1.8.0), libglib2.0-0 (>= 2.12.0), libgps28 (>= 3.3), [-libgrpc++1, libgrpc10,-] {+libgrpc++1 (>= 1.30.2), libgrpc10 (>= 1.30.2),+} libhiredis0.14 (>= 0.14.0), libi2c0 (>= 4.0), libip4tc2 (>= 1.8.3), libip6tc2 (>= 1.8.3), libjansson4 (>= 2.0.1), libldap-2.4-2 (>= 2.4.7), liblua5.3-0, libmariadb3 (>= 3.0.0), libmemcached11, libmicrohttpd12 (>= 0.9.50), libmnl0 (>= 1.0.3-4~), libmodbus5 (>= 3.0.2), libmongoc-1.0-0 (>= [-1.17.3),-] {+1.17.5),+} libmosquitto1 (>= 1.2), libnotify4 (>= 0.7.0), libopenipmi0 (>= 2.0.29), liboping0 (>= 0.3.3), libowcapi-3.2-4 (>= 3.2p4+dfsg1), libpcap0.8 (>= 1.0.0), libperl5.32 (>= 5.32.0~rc1), libpq5, libprotobuf-c1 (>= 1.0.1), libprotobuf23 (>= 3.12.4), libpython3.9 (>= [-3.9.0~b4),-] {+3.9.1),+} libqpid-proton11, librabbitmq4 (>= 0.8.0), librdkafka1 (>= 0.9.1), libriemann-client0 (>= 1.10.0), librrd8 (>= 1.4~rc2), librte-eal21 (>= 20.11), librte-ethdev21 (>= 20.11), libsensors5 (>= 1:3.5.0), libsnmp40 (>= 5.9+dfsg), libssl1.1 (>= 1.1.0), libstdc++6 (>= 5.2), libudev1 (>= 183), libvarnishapi2 (>= 6.1.0), libvirt0 (>= 1.2.11~rc1), libxenmisc4.14, libxml2 (>= 2.7.4), libyajl2 (>= 2.0.4), default-jre-headless
Version: [-5.12.0-5-] {+5.12.0-6+}
Control files of package collectd-dev: lines which differ (wdiff format)
------------------------------------------------------------------------
Depends: collectd-core (>= [-5.12.0-5),-] {+5.12.0-6),+} collectd-core (<< [-5.12.0-5.1~)-] {+5.12.0-6.1~)+}
Installed-Size: [-357-] {+542+}
Version: [-5.12.0-5-] {+5.12.0-6+}
Control files of package collectd-utils: lines which differ (wdiff format)
--------------------------------------------------------------------------
Version: [-5.12.0-5-] {+5.12.0-6+}
Control files of package libcollectdclient-dev: lines which differ (wdiff format)
---------------------------------------------------------------------------------
Depends: libcollectdclient1 (= [-5.12.0-5)-] {+5.12.0-6)+}
Version: [-5.12.0-5-] {+5.12.0-6+}
Control files of package libcollectdclient1: lines which differ (wdiff format)
------------------------------------------------------------------------------
Version: [-5.12.0-5-] {+5.12.0-6+}
Reply to: