aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rwxr-xr-xdebian/rules8
2 files changed, 16 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 9610fbca..7c411798 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bitlbee (3.5-2) unstable; urgency=medium
+
+ * TFW you find out the corrected fix diff posted on #821967 was still the
+ broken one and you end up doing your third upload in a weekend. :-(
+ Obviously build-* targets shouldn't call into binary-*, as that one
+ starts requiring root. This broke builds on buildd's.
+ * Now contains the same fix like 3.4.2-1.1, which as it turns out 3.5-1.1
+ did not. (Closes: #853017)
+
+ -- Wilmer van der Gaast <wilmer@gaast.net> Sat, 28 Jan 2017 21:06:27 +0000
+
bitlbee (3.5-1.1) unstable; urgency=medium
[ dequis ]
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: