diff options
| author | dequis <dx@dxzone.com.ar> | 2017-01-26 21:44:52 -0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2017-01-26 21:46:49 -0300 |
| commit | b5fb9033d479bba6b22d7d66f7d0ec3e24086d93 (patch) | |
| tree | f50589ef41d0277c74381733d4b8e968976c4f86 | |
| parent | b8bc39837a21d5adf12d4252b4ba6b30098010db (diff) | |
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
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ff135807..b5b30f85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +bitlbee (3.5-1.1) UNRELEASED; urgency=medium + + [ Michael Lustfield ] + * Adding build-{arch,indep} targets. (Closes: #821967) + * Added python to build depends. + + [ dequis ] + * Merge changes from 3.4.2-1.1 NMU into 3.5-1 + + -- dequis <dx@dxzone.com.ar> Thu, 26 Jan 2017 21:39:24 -0300 + bitlbee (3.5-1) unstable; urgency=medium [ Jochen Sprickerhof ] diff --git a/debian/control b/debian/control index 6a28cc26..89a7efb3 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Wilmer van der Gaast <wilmer@gaast.net> Uploaders: Jelmer Vernooij <jelmer@debian.org> Standards-Version: 3.9.8 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227) +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227), python Homepage: http://www.bitlbee.org/ Vcs-Git: https://github.com/bitlbee/bitlbee Vcs-Browser: https://github.com/bitlbee/bitlbee 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: |