diff -Nru sbuild-0.62.6/debian/changelog sbuild-0.62.6/debian/changelog --- sbuild-0.62.6/debian/changelog 2012-02-16 06:30:41.000000000 +0000 +++ sbuild-0.62.6/debian/changelog 2012-02-21 21:55:51.000000000 +0000 @@ -1,3 +1,10 @@ +sbuild (0.62.6-1ubuntu2) precise; urgency=low + + * Run lintian from within the build chroot, Closes: #626361 + * Refresh patches. + + -- Reinhard Tartler Tue, 21 Feb 2012 22:55:48 +0100 + sbuild (0.62.6-1ubuntu1) precise; urgency=low * Merge from Debian testing. Remaining changes: diff -Nru sbuild-0.62.6/debian/patches/run-lintian-inside-chroot.patch sbuild-0.62.6/debian/patches/run-lintian-inside-chroot.patch --- sbuild-0.62.6/debian/patches/run-lintian-inside-chroot.patch 1970-01-01 00:00:00.000000000 +0000 +++ sbuild-0.62.6/debian/patches/run-lintian-inside-chroot.patch 2012-02-21 21:54:00.000000000 +0000 @@ -0,0 +1,22 @@ +=== modified file 'lib/Sbuild/Build.pm' +--- a/lib/Sbuild/Build.pm ++++ b/lib/Sbuild/Build.pm +@@ -1139,12 +1139,17 @@ sub run_lintian { + + $self->log_subsubsection("lintian"); + ++ my $resolver = $self->get('Dependency Resolver'); + my $lintian = $self->get_conf('LINTIAN'); + my @lintian_command = ($lintian); + push @lintian_command, @{$self->get_conf('LINTIAN_OPTIONS')} if + ($self->get_conf('LINTIAN_OPTIONS')); + push @lintian_command, $self->get('Changes File'); +- $self->get('Host')->run_command( ++ ++ $resolver->add_dependencies('LINTIAN', 'lintian'); ++ return 1 unless $resolver->install_deps('lintian', 'LINTIAN'); ++ ++ $self->get('Session')->run_command( + { COMMAND => \@lintian_command, + PRIORITY => 0, + }); diff -Nru sbuild-0.62.6/debian/patches/run-pre-build-hooks-as-root.patch sbuild-0.62.6/debian/patches/run-pre-build-hooks-as-root.patch --- sbuild-0.62.6/debian/patches/run-pre-build-hooks-as-root.patch 2011-08-18 16:21:57.000000000 +0000 +++ sbuild-0.62.6/debian/patches/run-pre-build-hooks-as-root.patch 2012-02-21 21:54:15.000000000 +0000 @@ -4,11 +4,9 @@ Author: Kees Cook Last-Update: 2011-08-18 -Index: sbuild-0.62.5/lib/Sbuild/Build.pm -=================================================================== ---- sbuild-0.62.5.orig/lib/Sbuild/Build.pm 2011-07-11 07:07:43.088149817 -0700 -+++ sbuild-0.62.5/lib/Sbuild/Build.pm 2011-08-18 09:21:54.678558240 -0700 -@@ -1005,6 +1005,11 @@ +--- a/lib/Sbuild/Build.pm ++++ b/lib/Sbuild/Build.pm +@@ -1017,6 +1017,11 @@ sub run_command { my $log_output = shift; my $log_error = shift; my $chroot = shift; @@ -20,7 +18,7 @@ # Used to determine if we are to log from commands my ($out, $err, $defaults); -@@ -1025,9 +1030,11 @@ +@@ -1037,9 +1042,11 @@ sub run_command { $defaults = $self->get('Session')->{'Defaults'}; $out = $defaults->{'STREAMOUT'} if ($log_output); $err = $defaults->{'STREAMERR'} if ($log_error); @@ -33,7 +31,7 @@ PRIORITY => 0, STREAMOUT => $out, STREAMERR => $err, -@@ -1060,11 +1067,13 @@ +@@ -1072,11 +1079,13 @@ sub run_external_commands { # Create appropriate log message and determine if the commands are to be # run inside the chroot or not. my $chroot = 0; @@ -47,7 +45,7 @@ } elsif ($stage eq "chroot-cleanup-commands") { $self->log_subsection("Chroot Cleanup Commands"); $chroot = 1; -@@ -1098,7 +1107,7 @@ +@@ -1110,7 +1119,7 @@ sub run_external_commands { } my $command_str = join(" ", @{$command}); $self->log_subsubsection("$command_str"); diff -Nru sbuild-0.62.6/debian/patches/series sbuild-0.62.6/debian/patches/series --- sbuild-0.62.6/debian/patches/series 2011-06-26 11:52:31.000000000 +0000 +++ sbuild-0.62.6/debian/patches/series 2012-02-21 21:51:31.000000000 +0000 @@ -1,2 +1,3 @@ do-not-install-debfoster-into-chroots.patch run-pre-build-hooks-as-root.patch +run-lintian-inside-chroot.patch