lp://qastaging/~noskcaj/ubuntu/utopic/collectd/merge
- Get this branch:
- bzr branch lp://qastaging/~noskcaj/ubuntu/utopic/collectd/merge
Branch merges
- Martin Pitt: Approve
-
Diff: 17601 lines (+7491/-7165)60 files modifiedChangeLog (+24/-0)
INSTALL (+0/-370)
Makefile.in (+17/-10)
aclocal.m4 (+57/-0)
bindings/Makefile.in (+10/-3)
bindings/java/Makefile.in (+10/-3)
configure (+164/-52)
configure.ac (+5601/-0)
configure.in (+0/-5546)
contrib/collection3/etc/collection.conf (+8/-8)
contrib/redhat/collectd.spec (+143/-3)
debian/changelog (+63/-0)
debian/collectd.conf (+1/-1)
debian/control (+4/-3)
debian/patches/00list (+2/-1)
debian/patches/amqp_0_4.dpatch (+0/-109)
debian/patches/collection.cgi.dpatch (+75/-0)
debian/patches/libperl-linkage.dpatch (+48/-48)
debian/patches/myplugin_api.dpatch (+76/-0)
debian/rules (+11/-4)
src/Makefile.am (+3/-3)
src/Makefile.in (+935/-899)
src/amqp.c (+49/-3)
src/apache.c (+9/-0)
src/aquaero.c (+2/-2)
src/cgroups.c (+12/-7)
src/collectd-email.5 (+1/-1)
src/collectd-exec.5 (+1/-1)
src/collectd-java.5 (+1/-1)
src/collectd-nagios.1 (+1/-1)
src/collectd-perl.5 (+1/-1)
src/collectd-python.5 (+1/-1)
src/collectd-snmp.5 (+1/-1)
src/collectd-tg.1 (+1/-1)
src/collectd-threshold.5 (+1/-1)
src/collectd-unixsock.5 (+1/-1)
src/collectd.1 (+1/-1)
src/collectd.c (+1/-1)
src/collectd.conf.5 (+4/-4)
src/collectd.conf.in (+9/-1)
src/collectd.conf.pod (+3/-3)
src/collectdctl.1 (+1/-1)
src/collectdmon.1 (+1/-1)
src/config.h.in (+14/-1)
src/curl.c (+2/-1)
src/curl_json.c (+5/-4)
src/curl_xml.c (+1/-0)
src/interface.c (+6/-5)
src/libcollectdclient/Makefile.in (+35/-17)
src/libcollectdclient/collectd/lcc_features.h (+2/-2)
src/liboconfig/Makefile.in (+41/-18)
src/network.c (+8/-1)
src/target_replace.c (+2/-2)
src/target_set.c (+2/-2)
src/types.db (+2/-1)
src/types.db.5 (+1/-1)
src/utils_mount.c (+0/-3)
src/write_graphite.c (+10/-6)
src/zfs_arc.c (+5/-3)
version-gen.sh (+1/-1)
Related bugs
Bug #1273875: please include new bugfix release 5.4.1 in trusty | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 43. By Jackson Doak
-
* Merge with Debian; remaining changes:
- debian/rules: Update config.{sub,guess} with dh_autotools-dev for arm64.
- libperl-linkage. dpatch: Separate Perl ldopts into components suitable
for LDFLAGS and LIBS, fixing build failure with 'ld --as-needed'.
- Patch configure, aclocal.m4 and libtool.m4 for ppc64le.
* debian/control:
- Added libupsclient-dev as primary alternate build-dep to
libupsclient1-dev; thanks to Laurent Bigonville for reporting this and
Marc Fournier for sending a patch (Closes: #730397).
* debian/rules, debian/control:
- Disable varnish for now; it does not work with varnish 4;
c.f. https://bugs.debian. org/745902 (Closes: #745894).
- Drop build dependency on libvarnishapi-dev.
- Build-depend on libow-dev and re-enable the onewire plugin; thanks to
Adam Smutnicki for pointing this out (Closes: #744956).
* debian/rules:
- Added INSTALL_BASE= to perl options; else, modules are installed
into $HOME.
- Prepend collectd/core to collectd's header files; thanks to Sergio
Jimenez for reporting this (Closes: #739516).
* debian/patches:
- Added collection.cgi.dpatch fixing apache data-sources; thanks to
Fabiano Pires for reporting this and providing a patch
(Closes: #743881).
- Added myplugin_api.dpatch updating myplugin.c to the latest API.
* New upstream release:
- Fixed a segfault when using <Match> without an Instance; thanks to
Alexander Golovko for reporting this (Closes: #732701).
- Fixed gcrypt initialization issues (partly fixed in 5.1.1 already);
thanks to Pieter Lexis for reporting this (Closes: #735173).
* debian/patches:
- Removed amqp_0_4.dpatch; merged upstream.
* debian/control:
- Updated standards-version to 3.9.5; no changes.
* debian/rules:
- Use -Wno-error=deprecated- declarations to suppress libdbi deprecation
warnings for now; they would else cause build failures due to -Werror. - 41. By Adam Conrad
-
* Cherry-pick the following change from Debian to work around our FTBFS:
- Use -Wno-error=deprecated- declarations to suppress libdbi deprecation
warnings for now; they would else cause build failures due to -Werror. - 40. By Matthias Klose
-
* Merge with Debian; remaining changes:
- debian/rules: Update config.{sub,guess} with dh_autotools-dev for arm64.
- libperl-linkage. dpatch: Separate Perl ldopts into components suitable
for LDFLAGS and LIBS, fixing build failure with 'ld --as-needed'.
* Build-depend on libupsclient-dev instead of libupsclient1-dev.
* Patch configure, aclocal.m4 and libtool.m4 for ppc64le. - 36. By Colin Watson
-
* Resynchronise with Debian. Remaining changes:
- debian/control: Remove libhal-dev as Build-Dependency so collectd can
be moved to main.
- libperl-linkage. dpatch: Separate Perl ldopts into components suitable
for LDFLAGS and LIBS, fixing build failure with 'ld --as-needed'.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/utopic/collectd