From 3d0b97a60c445b824702c4acd954574c41d919f5 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 18 May 2012 02:03:35 -0500 Subject: [PATCH] debian/rules build-indep: assume Build-Depends-Indep are present Now that dpkg-buildpackage uses the build-arch target when present instead of build, there is no more need to guard against a build environment that tries to invoke build-indep without ensuring its dependencies are available. --- debian/changelog | 5 ++++- debian/control | 2 +- debian/rules | 7 +------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f2747af..4eefbd6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,10 +24,13 @@ xz-utils (5.1.1alpha+20120510-0.1) unstable; urgency=low Thanks to Anton Tolchanov for a report. Closes: #673001. * debian/rules: - Use dpkg-buildflags to retrieve compiler flags, including - hardening options. Build-Depends: dpkg-dev (>= 1.16.1~). + hardening options. Build-Depends: dpkg-dev (>= 1.16.1). Closes: #653739. - ./configure --disable-threads for now. - Simplify build-arch rule. + - Remove workaround for #478524 (sbuild invoking build target + without installing Build-Depends-Indep). Build-Depends: + dpkg-dev (>= 1.16.2). - Rearrange for clarity. * debian/changelog.upstream.sh: Use ‘git rev-list | git diff-tree’ instead of ‘git log’ for reliable output independent of the diff --git a/debian/control b/debian/control index e449d085..986f0c10 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: required Maintainer: Jonathan Nieder Uploaders: Mohammed Adnène Trojette -Build-Depends: debhelper (>= 8.9.0), perl, dpkg-dev (>= 1.16.1~), +Build-Depends: debhelper (>= 8.9.0), perl, dpkg-dev (>= 1.16.2), autoconf (>= 2.64~), automake, libtool (>= 2.2), gettext, autopoint | gettext (<< 0.18-1), autopoint | cvs Build-Depends-Indep: doxygen diff --git a/debian/rules b/debian/rules index f238b6f5..832e9b5c 100755 --- a/debian/rules +++ b/debian/rules @@ -7,12 +7,7 @@ build clean install binary-arch binary-indep binary: build-arch:: build-plain build-small build-indep: debian/normal-build/Makefile - : 'Work around bug #478524' - set -e; if type doxygen >/dev/null 2>/dev/null; \ - then \ - cd debian/normal-build; \ - doxygen Doxyfile; \ - fi + cd debian/normal-build && doxygen Doxyfile autoreconf_sources := $(wildcard Makefile.am */Makefile.am */*/Makefile.am) autoreconf_sources += configure.ac -- 2.11.4.GIT