Ubuntu
collectd package

Merge ~kswoboda/ubuntu/+source/collectd:applied/ubuntu/focal-proposed into ubuntu/+source/collectd:applied/ubuntu/focal-proposed

  1. Git
  2. lp:~kswoboda/ubuntu/+source/collectd
  3. applied/ubuntu/focal-proposed
  4. Merge into applied/ubuntu/focal-proposed
Proposed by Kamil Swoboda
Status: Needs review
Proposed branch: ~kswoboda/ubuntu/+source/collectd:applied/ubuntu/focal-proposed
Merge into: ubuntu/+source/collectd:applied/ubuntu/focal-proposed
Diff against target: 13 lines (+1/-1)
1 file modified
configure.ac (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
git-ubuntu developers Pending
Review via email: mp+386085@code.launchpad.net

Commit message

LP: #1872281

Fix collectd python module on Python 3.8

Backports from 5.11 collectd package: https://github.com/collectd/collectd/pull/3344/files#diff-67e997bcfdac55191033d57a16d1408a

To post a comment you must log in.

Unmerged commits

eea7785... by Kamil Swoboda <email address hidden>

LP: #1872281

Fix collectd python module on Python 3.8

26e2e27... by Łukasz Zemczak

Import patches-applied version 5.9.2.g-1ubuntu5 to applied/ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: c5a827023bec869652a118f137ab3a79c5aafedd
Unapplied parent: 2d355b50c5747b8e8c9559d828b87dd9ae0bcf43

New changelog entries:
  * debian/control: stop depending on the transitional iptables-dev as it is
    no longer provided - depend on libiptc-dev instead. Fixes NBS.

2d355b5... by Łukasz Zemczak

Use paths for nagios-nrpe-server & monitoring-plugins Debian packages.

Gbp-Pq: nagios-debian-paths.patch.

ae0f76c... by Łukasz Zemczak

Let the example plugin include the core headers from

Gbp-Pq: myplugin_includes.patch.

b324983... by Łukasz Zemczak

Set the path of collection.conf to /etc/collectd/.

Gbp-Pq: collection_conf_path.patch.

192bbdb... by Łukasz Zemczak

Set the path of rrd_filter.px to /usr/lib/collectd/utils/.

Gbp-Pq: rrd_filter_path.patch.

e58ec77... by Łukasz Zemczak

Import patches-unapplied version 5.9.2.g-1ubuntu5 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 11354ea17cd823a52b5096ef5427f3b8d324307d

New changelog entries:
  * debian/control: stop depending on the transitional iptables-dev as it is
    no longer provided - depend on libiptc-dev instead. Fixes NBS.

c5a8270... by Christian Ehrhardt 

Import patches-applied version 5.9.2.g-1ubuntu4 to applied/ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: e073cc12d052fbefc14886caa471faa5490ab428
Unapplied parent: eec2612ece4cdbbb08f1488b38efc396ff17be72

New changelog entries:
  * No-change rebuild for libxen* 4.11

11354ea... by Christian Ehrhardt 

Import patches-unapplied version 5.9.2.g-1ubuntu4 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Upload parent: fe4c796dae86d99993d77522db557fecafd3c27a

eec2612... by Christian Ehrhardt 

Use paths for nagios-nrpe-server & monitoring-plugins Debian packages.

Gbp-Pq: nagios-debian-paths.patch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/configure.ac b/configure.ac
2index a1ce009..2aeac50 100644
3--- a/configure.ac
4+++ b/configure.ac
5@@ -4769,7 +4769,7 @@ if test "$PYTHON_CONFIG" != ""; then
6 if test $? -ne 0; then
7 with_libpython="no"
8 fi
9- LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags`"
10+ LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags --embed`" || LIBPYTHON_LDFLAGS="`${PYTHON_CONFIG} --ldflags`"
11 if test $? -ne 0; then
12 with_libpython="no"
13 fi

Subscribers

People subscribed via source and target branches