[Build-common-hackers] Bug#277672: Track autothings in Build-Depends when generating debian/control

[Robert Millan]

This is a multi-part MIME message sent by reportbug.

--===============0868552663==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: cdbs
Version: 0.4.24-1
Severity: wishlist
Tags: patch

This patch adds autothings automagicaly to Build-Depends when they have been
requirested by the DEB_AUTO_UPDATE_* interface and debian/control is being
auto-generated.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i386)
Kernel: GNU/kFreeBSD 5.2.1-7
Locale: LANG=C, LC_CTYPE=C (ignored: LC_ALL set to C)

-- no debconf information

--===============0868552663==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="cdbs.diff"

diff -ur cdbs-0.4.24.old/1/class/autotools-vars.mk.in cdbs-0.4.24/1/class/autotools-vars.mk.in
--- cdbs-0.4.24.old/1/class/autotools-vars.mk.in	2004-08-27 01:36:56.000000000 +0200
+++ cdbs-0.4.24/1/class/autotools-vars.mk.in	2004-10-21 17:52:20.000000000 +0200
@@ -64,4 +64,50 @@
 DEB_CONFIGURE_LIBEXECDIR ="\$${prefix}/lib/$(DEB_SOURCE_PACKAGE)"
 DEB_CONFIGURE_EXTRA_FLAGS =
 
+ifneq (, $(DEB_AUTO_UPDATE_LIBTOOL))
+CDBS_BUILD_DEPENDS += , libtool
+endif
+
+ifneq (:, $(DEB_AUTO_UPDATE_ACLOCAL):$(DEB_AUTO_UPDATE_AUTOMAKE))
+ifeq ($(DEB_AUTO_UPDATE_ACLOCAL), $(DEB_AUTO_UPDATE_AUTOMAKE))
+# avoid duped build-dependencies
+CDBS_BUILD_DEPENDS += , automake-$(DEB_AUTO_UPDATE_ACLOCAL)
+else
+# either only one of them is required, or different versions are
+ifneq (, $(DEB_AUTO_UPDATE_ACLOCAL))
+CDBS_BUILD_DEPENDS += , automake-$(DEB_AUTO_UPDATE_ACLOCAL)
+endif
+ifneq (, $(DEB_AUTO_UPDATE_AUTOMAKE))
+CDBS_BUILD_DEPENDS += , automake-$(DEB_AUTO_UPDATE_AUTOMAKE)
+endif
+endif
+endif
+
+ifneq (:, $(DEB_AUTO_UPDATE_AUTOCONF):$(DEB_AUTO_UPDATE_AUTOHEADER))
+ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), $(DEB_AUTO_UPDATE_AUTOHEADER))
+# avoid duped build-dependencies
+ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), 2.13)
+CDBS_BUILD_DEPENDS += , autoconf2.13
+else
+CDBS_BUILD_DEPENDS += , autoconf
+endif
+else
+# either only one of them is required, or different versions are
+ifneq (, $(DEB_AUTO_UPDATE_AUTOCONF))
+ifeq ($(DEB_AUTO_UPDATE_AUTOCONF), 2.13)
+CDBS_BUILD_DEPENDS += , autoconf2.13
+else
+CDBS_BUILD_DEPENDS += , autoconf
+endif
+endif
+ifneq (, $(DEB_AUTO_UPDATE_AUTOHEADER))
+ifeq ($(DEB_AUTO_UPDATE_AUTOHEADER), 2.13)
+CDBS_BUILD_DEPENDS += , autoconf2.13
+else
+CDBS_BUILD_DEPENDS += , autoconf
+endif
+endif
+endif
+endif
+
 endif
diff -ur cdbs-0.4.24.old/debian/control.in cdbs-0.4.24/debian/control.in
--- cdbs-0.4.24.old/debian/control.in	2004-09-24 19:43:06.000000000 +0200
+++ cdbs-0.4.24/debian/control.in	2004-10-21 17:58:32.000000000 +0200
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: CDBS Hackers <build-common-hackers@lists.alioth.debian.org>
-Build-Depends-Indep: docbook-xsl, xsltproc, springgraph, ocaml-native-compilers | ocaml, realpath, fakeroot, python-dev @cdbs@
+Build-Depends-Indep: @cdbs@, docbook-xsl, xsltproc, springgraph, ocaml-native-compilers | ocaml, realpath, fakeroot, python-dev
 Build-Conflicts-Indep: autoconf (<< 2.54)
 Uploaders: Colin Walters <walters@debian.org>, Jeff Bailey <jbailey@raspberryginger.com>, Jonas Smedegaard <dr@jones.dk>, Chris Cheney <ccheney@debian.org>, Stefan Gybas <sgybas@debian.org>
 Standards-Version: 3.5.10

--===============0868552663==--