[buildd-tools-devel] Bug#870263: [PATCH] Update defaults (--build-arch-all, --run-lintian)

[Michael Stapelberg]

Package: sbuild
Version: 0.73.0-4
Severity: wishlist
Tags: patch

(Split out of #859867 as requested.)

Please consider merging the attached patches.

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armel, mipsel, arm64

Kernel: Linux 4.11.0-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages sbuild depends on:
ii  adduser         3.115
ii  libsbuild-perl  0.73.0-4
ii  perl            5.26.0-4

Versions of packages sbuild recommends:
ii  autopkgtest  4.4
ii  debootstrap  1.0.90
ii  schroot      1.6.10-4

Versions of packages sbuild suggests:
ii  deborphan  1.7.28.8-0.3+b1
ii  kmod       24-1
ii  wget       1.19.1-4

-- Configuration Files:
/etc/sbuild/sbuild.conf [Errno 2] No such file or directory: '/etc/sbuild/sbuild.conf'

-- no debconf information
-------------- next part --------------
>From 0f1c56d8978c9779d3165c1e5664b2416d93cc95 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg at debian.org>
Date: Mon, 31 Jul 2017 14:05:02 +0200
Subject: [PATCH 1/2] Build arch: all packages by default.

---
 lib/Sbuild/Conf.pm | 2 +-
 man/sbuild.1.in    | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Sbuild/Conf.pm b/lib/Sbuild/Conf.pm
index b70f721e..e8082a89 100644
--- a/lib/Sbuild/Conf.pm
+++ b/lib/Sbuild/Conf.pm
@@ -138,7 +138,7 @@ sub setup ($) {
 	    TYPE => 'BOOL',
 	    VARNAME => 'build_arch_all',
 	    GROUP => 'Build options',
-	    DEFAULT => 0,
+	    DEFAULT => 1,
 	    HELP => 'Build architecture: all packages by default.',
 	    CLI_OPTIONS => ['--arch-all', '--no-arch-all']
 	},
diff --git a/man/sbuild.1.in b/man/sbuild.1.in
index bdacb654..f47d8673 100644
--- a/man/sbuild.1.in
+++ b/man/sbuild.1.in
@@ -1175,9 +1175,8 @@ configuration variables \fBBUILD_ARCH_ANY\fR, \fBBUILD_ARCH_ALL\fR and
 .BR sbuild.conf (5)
 for a detailed explanation of these configuration variables.
 .PP
-By default, only \fBBUILD_ARCH_ANY\fR is set to true while \fBBUILD_ARCH_ALL\fR
-and \fBBUILD_SOURCE\fR are set to false. So by default only architecture
-specific binary packages will be built. This behaviour can be changed either by
+By default, \fBBUILD_ARCH_ANY\fR and \fBBUILD_ARCH_ALL\fR are set to true while
+\fBBUILD_SOURCE\fR is set to false. This behaviour can be changed either by
 using command line options or by modifying the configuration variables in your
 \fI~/.sbuildrc\fP. The relevant command line options to change the values of
 \fBBUILD_ARCH_ANY\fR, \fBBUILD_ARCH_ALL\fR and \fBBUILD_SOURCE\fR are
-- 
2.13.2

-------------- next part --------------
>From 6aaed4dfebf4995d1ed30bf520c452cf78cf0d45 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg at debian.org>
Date: Mon, 31 Jul 2017 14:05:16 +0200
Subject: [PATCH 2/2] Run lintian by default.

---
 lib/Sbuild/Conf.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Sbuild/Conf.pm b/lib/Sbuild/Conf.pm
index e8082a89..57651b46 100644
--- a/lib/Sbuild/Conf.pm
+++ b/lib/Sbuild/Conf.pm
@@ -1077,7 +1077,7 @@ $crossbuild_core_depends = {
 		my $conf = shift;
 		$conf->check('LINTIAN');
 	    },
-	    DEFAULT => 0,
+	    DEFAULT => 1,
 	    HELP => 'Run lintian?',
 	    CLI_OPTIONS => ['--run-lintian', '--no-run-lintian']
 	},
-- 
2.13.2