Package: sbuild
Version: 0.60.9-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch
*** /tmp/tmpVBaqZt
In Ubuntu, the attached patch was applied to achieve the following:
* lib/Sbuild/Build.pm: work around Lucid issue that has diff listed in
build-essential instead of diffutils. This causes schroots that don't
have universe enabled to fail to install dependencies. (LP: #741897)
This may be worthwhile for Debian users who want to build packages for
Ubuntu. Thanks.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u sbuild-0.60.9/lib/Sbuild/Build.pm sbuild-0.60.9/lib/Sbuild/Build.pm
--- sbuild-0.60.9/lib/Sbuild/Build.pm
+++ sbuild-0.60.9/lib/Sbuild/Build.pm
@@ -1464,11 +1464,15 @@
}
# Workaround http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=602571
+ # Also works around Ubuntu Lucid shipping with "diff" instead of
+ # "diffutils": https://bugs.launchpad.net/ubuntu/+source/sbuild/+bug/741897
if (open( F, "$self->{'Chroot Dir'}/etc/lsb-release" )) {
while( <F> ) {
if ($_ eq "DISTRIB_ID=Ubuntu\n") {
@essential = grep(!/^sysvinit$/, @essential);
- last;
+ }
+ if ($_ eq "DISTRIB_CODENAME=lucid\n") {
+ s/^diff$/diffutils/ for (@essential);
}
}
close( F );
diff -u sbuild-0.60.9/debian/changelog sbuild-0.60.9/debian/changelog
