diff --git a/srcpkgs/debootstrap/files/bug-668001.patch b/srcpkgs/debootstrap/files/bug-668001.patch index 44e1a144ad..117a1c89eb 100644 --- a/srcpkgs/debootstrap/files/bug-668001.patch +++ b/srcpkgs/debootstrap/files/bug-668001.patch @@ -20,15 +20,17 @@ while () { chomp; if (/^Package: (.*)$/) { -@@ -1187,9 +1189,13 @@ +@@ -1187,10 +1189,14 @@ $in = 0 if (/^$/); if ($in and (/^Depends: (.*)$/ or /^Pre-Depends: (.*)$/)) { for $d (split /\s*,\s*/, $1) { - $d =~ s/\s*[|].*$//; - $d =~ s/\s*[(].*[)]\s*//; +- $d =~ s/:.*//; - push @d, $d; + for $p (split /\s*\|\s*/, $d) { + $p =~ s/\s*[(].*[)]\s*//; ++ $p =~ s/:.*//; + if (!$exclude{$p}) { + push @d, $p; + last; diff --git a/srcpkgs/debootstrap/template b/srcpkgs/debootstrap/template index 323049fec7..2bbf8eadcb 100644 --- a/srcpkgs/debootstrap/template +++ b/srcpkgs/debootstrap/template @@ -1,16 +1,16 @@ # Template file for 'debootstrap' pkgname=debootstrap -version=1.0.87 +version=1.0.88 revision=1 build_style=fetch depends="binutils bzip2 gnupg gzip tar wget xz" short_desc="Bootstrap a basic Debian system" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="custom" homepage="http://packages.qa.debian.org/d/debootstrap.html" distfiles="${DEBIAN_SITE}/main/d/${pkgname}/${pkgname}_${version}_all.deb ${DEBIAN_SITE}/main/d/debian-archive-keyring/debian-archive-keyring_2014.3_all.deb" -checksum="a5f2d34a8f7bd28bb983024409a08f78725be8cddaef9af4734993e78df3b1fb +checksum="4549c01f84a720bc01a31d89f7dd747ae3156de004fed3a6507af348458c1238 017a2fba215cd64612891f5aa02546be5c0e30923a66672f889867cc6dd8d3a0" do_install() {