Roger Leigh <rleigh@debian.org> writes:
> Please could you unblock sbuild 0.57.5-1?
I have since uploaded 0.57.6-1 to unstable. Compared with 0.57.5,
this is just two hunks (excluding changelog and version bump). I
would really like to get this into Lenny.
diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm
index 792d4c4..d1b1367 100644
--- a/lib/Sbuild/Build.pm
+++ b/lib/Sbuild/Build.pm
@@ -1310,6 +1310,10 @@ sub check_dependencies (\$\@) {
if (!$dep->{'Rel'}) {
$fail .= "$name(still installed) ";
}
+ elsif ($stat->{'Version'} eq '~*=PROVIDED=*=') {
+ # It's a versioned build-conflict, but we installed
+ # a package that provides the conflicted package. It's ok.
+ }
elsif (version_compare($stat->{'Version'}, $dep->{'Rel'},
$dep->{'Version'})) {
$fail .= "$name(inst $stat->{'Version'} $dep->{'Rel'} ".
diff --git a/man/sbuild-stats.1.in b/man/sbuild-stats.1.in
index e4a8899..926b97e 100644
--- a/man/sbuild-stats.1.in
+++ b/man/sbuild-stats.1.in
@@ -56,7 +56,7 @@ Print version information.
Add an entry for a package. <time> is in the format HH:MM:SS, where
hours and minutes are optional.
.TP
-.BR\-d ", " "\-\-delete PACKAGE1" " [" PACKAGE2 " [" PACKAGE\f[BI]n\fP... ]]]
+.BR \-d ", " "\-\-delete PACKAGE1" " [" PACKAGE2 " [" PACKAGE\f[BI]n\fP... ]]]
Remove the data for a package from the database.
.TP
.BR \-\-dump " [" PACKAGE1 " [" PACKAGE2 " [" PACKAGE\f[BI]n\fP... ]]]
> The changes are here:
> http://git.debian.org/?p=buildd-tools/sbuild.git;a=shortlog;h=refs/heads/sbuild-lenny
The changes for 0.57.6-1 are also on this branch.
Every change between 0.57.4-1 (testing) and 0.57.6-1 (unstable) has
been reviewed, tested and verified to work. The git shortlog is at
the end of this mail. I have personally tested every change.
Each change is either
1) a bugfix. There are a number of important and serious bugs fixed,
as well as a similar number of bugs fixing not reported bugs
(including some things broken for several years)
2) Getopt::Long support for utilities adding --help and --version
options (at a minimum) for all utilities
3) manual page updates
I'm aware that this includes more than just bugfixes, but all of this
work was done to get sbuild into the best shape possible for Lenny; I
just didn't have the time to meet the freeze deadline, and I really
wouldn't want Lenny users to use 0.57.4-1 because there are a number
of serious bugs in that that make it break under very common use
cases.
Regards,
Roger
Enrico Zini (1):
[Sbuild::Conf] New parameter apt_allow_unauthenticated
Francois-Denis Gonthier (1):
[Sbuild::Build] Use 'DSC' rather than 'DSC File' when checking sources
Greg Hudson (1):
[Sbuild::Options] --make-binNMU should not assign an lvalue
Lucas Nussbaum (1):
[Sbuild::Build] ~*=PROVIDED=*= does not break Build-Conflicts
Roger Leigh (44):
[build] Bump version to 0.57.5
[debian] Close #489794
[Sbuild::Sysconfig] Export release date
[sbuild] Don't use $Sysconfig::hostname
[sbuild-createchroot] Rewrite in perl
[NEWS] Document sbuild-createchroot changes
[man] Bring sbuild-setup.7.in up to date
[man] Document sbuild-createchroot options
[Sbuild] Move dump_file, help_text and version_text from sbuild-createchroot
[Sbuild::Options] Use isin from Sbuild
[sbuild-createchroot] Set up sources.list with --components values
[sbuild] Exit with 0 status when no build object exists
[TODO] Add option parsing items
[Sbuild] Move usage_error from sbuild-createchroot to Sbuild
[Sbuild::Options] Add --help and --version options
[sbuild-hold] Add --help and --version options
[sbuild-createchroot] Use sensible @ARGV option counting
[man] Document sbuild --help and --version options
[sbuild-shell] Add --help and --version options
[sbuild-hold] Update copyrights
[sbuild-update] Add --help and --version options
[sbuild-stats] Add --help and --version options
[sbuild-apt] Add --help and --version options
[sbuild-checkpackages] Add --help and --version options
[sbuild-checkpackages] Update copyrights
[sbuild-adduser] Add --help and --version options
[sbuild-abort] Rewrite in perl
[man] Update sbuild option formatting and copyrights
[man] Update sbuild-shell option formatting
[sbuild] run_command is a method of $build_object, not a function
[TODO] Add new items
[debian] debian/rules: Remove avg* command symlinks
[build] Remove avg* command symlinks
Merge branch 'long-options'
[Sbuild::Log] Correctly format date in package log filename
[sbuild] $maintainer_name, $uploader_name and $key_id are now optional
[debian] sbuild.postrm: Correct use of local to remove bashisms
[man] Clean up synopsis and options formatting
[NEWS] Finalise for 0.57.5
[debian] Finalise changelog for 0.57.5
[debian] Don't install nonexistent avg-pkg* manual pages
[build] Bump version to 0.57.6
[Sbuild::Build] Use string rather than numeric comparison for '~*=PROVIDED=*='
[man] Fix typo in sbuild-stats.1
--
.''`. Roger Leigh
: :' : Debian GNU/Linux http://people.debian.org/~rleigh/
`. `' Printing on GNU/Linux? http://gutenprint.sourceforge.net/
`- GPG Public Key: 0x25BFB848 Please GPG sign your mail.
Attachment:
pgptEQqqqlts2.pgp
Description: PGP signature