lp://qastaging/~noskcaj/ubuntu/utopic/collectd/merge

Created by Jackson Doak and last modified
Get this branch:
bzr branch lp://qastaging/~noskcaj/ubuntu/utopic/collectd/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jackson Doak
Status:
Development

Recent revisions

44. By Jackson Doak

Merge with Debian. LP: #1273875 Remaining changes:

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.

42. By Colin Watson

Rebuild against libmemcached11.

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.

39. By Adam Conrad

No-change rebuild for the perl 5.14->5.18 transition.

38. By William Grant

debian/rules: Update config.{sub,guess} with dh_autotools-dev for arm64.

37. By Adam Conrad

Drop iproute-dev build-dep on all arches, it no longer exists.

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'.

35. By Colin Watson

Rebuild for libsnmp30.

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
This branch contains Public information 
Everyone can see this information.

Subscribers