From b5fb9033d479bba6b22d7d66f7d0ec3e24086d93 Mon Sep 17 00:00:00 2001 From: dequis Date: Thu, 26 Jan 2017 21:44:52 -0300 Subject: debian: Merge changes from 3.4.2-1.1 NMU into 3.5-1 Because apparently not having build-arch is now a build failure, even though lintian only considered it a warning and a "recommended" target --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index b1b3bd5c..5cbc7070 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,9 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed") +# https://bugs.debian.org/821967 +build-indep: binary-indep +build-arch: binary-arch build: build-stamp build-stamp: -- cgit v1.2.3 From 53cb4ae80e54b89efebc7d19f739d17fc3286383 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 28 Jan 2017 22:36:26 +0000 Subject: More troubles because the fix from the Debian bug didn't match the fix actually NMU'd. :-( Now this fix really should work. Third time's the charm after all, innit. --- debian/rules | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5cbc7070..4699d1c3 100755 --- a/debian/rules +++ b/debian/rules @@ -40,9 +40,11 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed") -# https://bugs.debian.org/821967 -build-indep: binary-indep -build-arch: binary-arch + +# No difference at the build stage so just call main build target. +# (Well indep could be docs-only but we prebuild them plus it's really +# not that much work.) +build-arch build-indep: build build: build-stamp build-stamp: -- cgit v1.2.3