From 76f80086cb4b5255570eba9350f5b81638e6c6c7 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 10 Jan 2020 18:27:42 +0100 Subject: * debian/rules: - Omit building the uninstallable network-manager binary (depends on wpasupplicant) on i386 --- debian/changelog | 8 ++++++++ debian/rules | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cc01931f..2175672b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.20.8-1ubuntu2) UNRELEASED; urgency=medium + + * debian/rules: + - Omit building the uninstallable network-manager binary (depends on + wpasupplicant) on i386 + + -- Sebastien Bacher Fri, 10 Jan 2020 18:26:29 +0100 + network-manager (1.20.8-1ubuntu1) focal; urgency=medium * New upstream version, merged from Debian diff --git a/debian/rules b/debian/rules index 98e08c1b..426533e6 100755 --- a/debian/rules +++ b/debian/rules @@ -6,12 +6,16 @@ include /usr/share/dpkg/architecture.mk LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') export LDFLAGS +ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) + BUILD_PACKAGES += -Nnetwork-manager +endif + export PYTHON=/usr/bin/python3 PPPD_PLUGIN_DIR := $(shell dh_ppp --plugin-dir) %: - dh $@ --with gir,ppp + dh $@ --with gir,ppp $(BUILD_PACKAGES) autoreconf: gtkdocize --copy -- cgit 1.3.0-6-gf8a5