From c70710fc698cb4a0177156396faa2c7593361eb9 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sun, 2 Dec 2018 09:23:52 +0100 Subject: [PATCH] Apply path by Andreas Henriksson to fix usrmerge issue. Pass PATH_TO_APTGET=/usr/bin/apt-get to configure - fixes reproducible build on merged-usr vs non-merged systems. (closes: #914092) --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index a1eb0b9..6098139 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ monitoring-plugins (2.2-5) UNRELEASED; urgency=medium + [ Bas Couwenberg ] * Bump Standards-Version to 4.2.1, no changes. + + [ Andreas Henriksson ] + * Pass PATH_TO_APTGET=/usr/bin/apt-get to configure + - fixes reproducible build on merged-usr vs non-merged systems. + (closes: #914092) + * -- Jan Wagner Sun, 13 May 2018 19:18:00 +0200 diff --git a/debian/rules b/debian/rules index 9d8267a..7b97073 100755 --- a/debian/rules +++ b/debian/rules @@ -82,6 +82,7 @@ config.status: configure # Add here commands to configure the package. # Append 'All warnings', 'Immediate binding' and dpkg-buildflags flags CFLAGS="$$(DEB_CFLAGS_MAINT_APPEND='-Wall -Wl,-z,now' dpkg-buildflags --get CFLAGS)" \ + PATH_TO_APTGET=/usr/bin/apt-get \ PGINCLUDE="-I`pg_config --includedir`" PGLIBS="-lpq -lcrypt" \ ./configure \ --disable-maintainer-mode \