Skip to content

Debian 5.9.1 / 5.9.2 package build candidate #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zebity wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Debian 5.9.1 / 5.9.2 package build candidate #18

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb2ef66
Update to 5.9.1
zebity Sep 23, 2019
94970b3
Remove for failure from configure result
zebity Sep 23, 2019
137fd48
Update to 5.9.2, due to defects in 5.9.1
zebity Sep 24, 2019
d2dc142
Add varnish re-enable into changelog
zebity Sep 24, 2019
d6fa9cf
Add varnish re-enable into changelog
zebity Sep 24, 2019
81df471
Turn off GCC 9 warnings that break snnp & dpdp build
zebity Nov 10, 2019
55bcb28
Align with debian https://salsa.debian.org/debian/pkg-collectd updates
zebity Nov 17, 2019
37b3eda
Update changelog to reflect LVM deprecation
zebity Nov 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
collectd (5.9.2-1) unstable; urgency=medium

* Non-maintainer upload.
* Fix "GCC 8.3/4 Tool Chain Issue":
debian/rules: removes build with -Wno-error=format-truncation as a temporary
workaround for the build failure with gcc-8 caused by a compiler warning.
* debian/patches:
- Remove liblvm2app_depreciation_warning.patch i2c_detection.patch ; upstream
* debian/control
- Add re-enable varnish plugin ; upstream

-- zebity spring <zebity@yahoo.com> Sun, 22 Sep 2019 21:55:00 +1000

collectd (5.8.1-1) unstable; urgency=medium

* New upstream release.
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 9.20160709~), dpkg-dev (>= 1.14.10), po-debconf, dh
libtokyotyrant-dev [linux-any],
libudev-dev [linux-any],
libupsclient-dev | libupsclient1-dev,
# libvarnishapi-dev,
libvarnishapi-dev,
libvirt-dev (>= 0.4.0-6) [linux-any],
libxen-dev [amd64 arm64 armhf i386],
libxml2-dev,
Expand Down
45 changes: 0 additions & 45 deletions debian/patches/i2c_detection.patch
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions debian/patches/liblvm2app_depreciation_warning.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions debian/patches/series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ rrd_filter_path.patch
collection_conf_path.patch
myplugin_includes.patch
nagios-debian-paths.patch
i2c_detection.patch
liblvm2app_depreciation_warning.patch
9 changes: 6 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
CPPFLAGS += -I$(CURDIR)/debian/include
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
CFLAGS += -Wall -Wno-error=deprecated-declarations
# 897724
CFLAGS += -Wno-error=format-truncation

TEST_GCC_VER_9 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 9)
ifeq ($(TEST_GCC_VER_9),1)
CFLAGS += -Wno-error=address-of-packed-member -Wno-stringop-truncation
endif

# Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to
# /etc/collectd would be wrong though.
Expand Down Expand Up @@ -207,7 +210,7 @@ build-stamp:
./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
JAVAC="$(JAVAC)" JAR="$(JAR)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
|| ( status=$$?; cat config.log; exit $$status )
|| ( echo "configure exit status: $$?" ; cat config.log )

$(MAKE)
dh_auto_test
Expand Down