diff -Nru sbuild-0.74.0/ChangeLog.in sbuild-0.75.0/ChangeLog.in --- sbuild-0.74.0/ChangeLog.in 2018-03-14 21:17:48.000000000 +0000 +++ sbuild-0.75.0/ChangeLog.in 2018-03-21 21:22:44.000000000 +0000 @@ -7,6 +7,14 @@ README file also contains more specific notes regarding building and configuration. + * Major changes in 0.75.0: + + 1) buildd: only build arch:any packages + + 2) buildd: do not run lintian + + 3) remove harmful unnecessary lintian binary check + * Major changes in 0.74.0: 1) Install dose-distcheck and lintian for the native architecture diff -Nru sbuild-0.74.0/debian/changelog sbuild-0.75.0/debian/changelog --- sbuild-0.74.0/debian/changelog 2018-03-17 05:56:58.000000000 +0000 +++ sbuild-0.75.0/debian/changelog 2018-03-23 05:15:11.000000000 +0000 @@ -1,3 +1,24 @@ +sbuild (0.75.0-1ubuntu1) bionic; urgency=low + + * Merge from Debian Sid (LP: #1756195). Remaining changes: + - no-pkg-mangle-deps.patch: Set NO_PKG_MANGLE=1 when building dummy + packages, as pkgbinarymangler's dpkg-deb expects to be run from a source + package. + - utf-8-by-default.patch: Switch to C.UTF-8 by default. + - abs-path-revert.patch: Revert upstream commit that breaks lp-buildd by + causing symlinks to files not ending in .dsc to no longer be buildable. + + -- Simon Quigley Fri, 23 Mar 2018 00:15:11 -0500 + +sbuild (0.75.0-1) unstable; urgency=medium + + * New upstream release. + * buildd: only build arch:any packages (closes: #893608) + * buildd: do not run lintian + * remove harmful unnecessary lintian binary check (closes: #893226) + + -- Michael Stapelberg Wed, 21 Mar 2018 22:24:01 +0100 + sbuild (0.74.0-1ubuntu1) bionic; urgency=medium * Merge from Debian Sid (LP: #1756195). Remaining changes: diff -Nru sbuild-0.74.0/debian/NEWS sbuild-0.75.0/debian/NEWS --- sbuild-0.74.0/debian/NEWS 2018-03-15 16:33:24.000000000 +0000 +++ sbuild-0.75.0/debian/NEWS 2018-03-22 04:48:26.000000000 +0000 @@ -1,3 +1,11 @@ +sbuild (0.75.0-1) unstable; urgency=medium + + sbuild now builds arch:all packages by default. + sbuild now runs lintian by default. + + -- Michael Stapelberg Wed, 21 Mar 2018 22:25:31 +0100 + + sbuild (0.73.0-3) unstable; urgency=medium Generating a public/private keypair using "sbuild-update --keygen" for diff -Nru sbuild-0.74.0/debian/patches/abs-path-revert.patch sbuild-0.75.0/debian/patches/abs-path-revert.patch --- sbuild-0.74.0/debian/patches/abs-path-revert.patch 2018-03-17 05:49:18.000000000 +0000 +++ sbuild-0.75.0/debian/patches/abs-path-revert.patch 2016-12-27 17:37:27.000000000 +0000 @@ -1,9 +1,9 @@ Revert d15d5ea67b81cde811207ff6853b381c3ebe4b41 Last-Update: 2016-06-28 ---- a/bin/sbuild -+++ b/bin/sbuild -@@ -84,10 +84,6 @@ sub main () { +--- x/bin/sbuild 2016-01-06 11:23:00.000000000 +0000 ++++ x/bin/sbuild 2016-01-21 10:09:57.609600750 +0000 +@@ -84,10 +84,6 @@ my $jobname = $ARGV[0]; my $source_dir = 0; @@ -14,7 +14,7 @@ if (-d $jobname) { $jobname = create_source_package($jobname); if ($jobname eq '.') { -@@ -171,6 +167,7 @@ sub main () { +@@ -171,6 +167,7 @@ sub create_source_package ($) { my $dsc = shift; diff -Nru sbuild-0.74.0/debian/patches/no-pkg-mangle-deps.patch sbuild-0.75.0/debian/patches/no-pkg-mangle-deps.patch --- sbuild-0.74.0/debian/patches/no-pkg-mangle-deps.patch 2018-03-17 05:49:17.000000000 +0000 +++ sbuild-0.75.0/debian/patches/no-pkg-mangle-deps.patch 2016-12-27 17:44:14.000000000 +0000 @@ -4,9 +4,11 @@ Forwarded: not-needed Last-Update: 2016-06-28 ---- a/lib/Sbuild/ResolverBase.pm -+++ b/lib/Sbuild/ResolverBase.pm -@@ -1232,7 +1232,7 @@ EOF +Index: sbuild-0.70.0/lib/Sbuild/ResolverBase.pm +=================================================================== +--- sbuild-0.70.0.orig/lib/Sbuild/ResolverBase.pm ++++ sbuild-0.70.0/lib/Sbuild/ResolverBase.pm +@@ -1232,7 +1232,7 @@ #Now build the package: $session->run_command( diff -Nru sbuild-0.74.0/debian/patches/utf-8-by-default.patch sbuild-0.75.0/debian/patches/utf-8-by-default.patch --- sbuild-0.74.0/debian/patches/utf-8-by-default.patch 2018-03-17 05:49:18.000000000 +0000 +++ sbuild-0.75.0/debian/patches/utf-8-by-default.patch 2016-12-27 17:46:53.000000000 +0000 @@ -3,8 +3,8 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1566590 Last-Update: 2016-06-28 ---- a/lib/Sbuild/Build.pm -+++ b/lib/Sbuild/Build.pm +--- sbuild-0.67.0.orig/lib/Sbuild/Build.pm ++++ sbuild-0.67.0/lib/Sbuild/Build.pm @@ -101,7 +101,7 @@ sub new { $host_defaults->{'USER'} = $self->get_conf('USERNAME'); $host_defaults->{'DIR'} = $self->get_conf('HOME'); @@ -14,7 +14,7 @@ $host_defaults->{'ENV'}->{'SHELL'} = '/bin/sh'; $host_defaults->{'ENV_FILTER'} = $self->get_conf('ENVIRONMENT_FILTER'); # Note, this should never fail. But, we should handle failure anyway. -@@ -562,7 +562,7 @@ END +@@ -562,7 +562,7 @@ sub run_chroot_session { $chroot_defaults->{'STREAMIN'} = $devnull; $chroot_defaults->{'STREAMOUT'} = $self->get('Log Stream'); $chroot_defaults->{'STREAMERR'} = $self->get('Log Stream'); @@ -23,8 +23,8 @@ $chroot_defaults->{'ENV'}->{'SHELL'} = '/bin/sh'; $chroot_defaults->{'ENV'}->{'HOME'} = '/sbuild-nonexistent'; $chroot_defaults->{'ENV_FILTER'} = $self->get_conf('ENVIRONMENT_FILTER'); ---- a/lib/Sbuild/Utility.pm -+++ b/lib/Sbuild/Utility.pm +--- sbuild-0.67.0.orig/lib/Sbuild/Utility.pm ++++ sbuild-0.67.0/lib/Sbuild/Utility.pm @@ -25,7 +25,7 @@ use Sbuild::ChrootInfoSchroot; use Sbuild::ChrootInfoSudo; use Sbuild::Sysconfig; diff -Nru sbuild-0.74.0/lib/Buildd/Daemon.pm sbuild-0.75.0/lib/Buildd/Daemon.pm --- sbuild-0.74.0/lib/Buildd/Daemon.pm 2018-03-14 21:17:48.000000000 +0000 +++ sbuild-0.75.0/lib/Buildd/Daemon.pm 2018-03-21 21:22:44.000000000 +0000 @@ -512,6 +512,7 @@ '--apt-update', '--no-apt-upgrade', '--no-apt-distupgrade', + '--no-run-lintian', '--batch', "--stats-dir=" . $self->get_conf('HOME') . "/stats", "--dist=" . $dist_config->get('DIST_NAME'); @@ -537,15 +538,11 @@ if ($dist_config->get('BUILD_DEP_RESOLVER') || $todo->{'build_dep_resolver'}) { push @sbuild_args, '--build-dep-resolver=' . ($dist_config->get('BUILD_DEP_RESOLVER') || $todo->{'build_dep_resolver'}); } - # Check if we need to build the arch:all. - if (defined($todo->{'arch_all'}) && $todo->{'arch_all'}) { - push @sbuild_args, '--arch-all'; - } if ($dist_config->get('BUILT_ARCHITECTURE')) { if ($dist_config->get('BUILT_ARCHITECTURE') eq 'all') { push ( @sbuild_args, "--arch-all", "--no-arch-any" ); } else { - push ( @sbuild_args, "--arch=" . $dist_config->get('BUILT_ARCHITECTURE') ); + push ( @sbuild_args, "--no-arch-all", "--arch-any", "--arch=" . $dist_config->get('BUILT_ARCHITECTURE') ); } } push ( @sbuild_args, "--chroot=" . $dist_config->get('SBUILD_CHROOT') ) diff -Nru sbuild-0.74.0/lib/Sbuild/Conf.pm sbuild-0.75.0/lib/Sbuild/Conf.pm --- sbuild-0.74.0/lib/Sbuild/Conf.pm 2018-03-14 21:17:48.000000000 +0000 +++ sbuild-0.75.0/lib/Sbuild/Conf.pm 2018-03-21 21:22:44.000000000 +0000 @@ -1056,16 +1056,6 @@ TYPE => 'STRING', VARNAME => 'lintian', GROUP => 'Build validation', - CHECK => sub { - my $conf = shift; - my $entry = shift; - my $key = $entry->{'NAME'}; - - # Only validate if needed. - if ($conf->get('RUN_LINTIAN')) { - $validate_program->($conf, $entry); - } - }, DEFAULT => 'lintian', HELP => 'Path to lintian binary' }, diff -Nru sbuild-0.74.0/VERSION sbuild-0.75.0/VERSION --- sbuild-0.74.0/VERSION 2018-03-14 21:17:48.000000000 +0000 +++ sbuild-0.75.0/VERSION 2018-03-21 21:22:44.000000000 +0000 @@ -1,3 +1,3 @@ Package: sbuild -Version: 0.74.0 -Release-Date: 14 Mar 2018 +Version: 0.75.0 +Release-Date: 21 Mar 2018