diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index be275e5..3ac19e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ pbuilder (0.12) unstable; urgency=low wait to see if something happens. Will start up a command-line if something fails, and ask for some remedy. + * It will now parse debian/control file with multi-line + Build-Depends line or Build-Conflicts line (closes: #120718) + However, I don't think the policy really permits this very clearly. + There are packages which exist doing this, and other tools do support this. -- Junichi Uekawa <dancer@debian.org> Fri, 23 Nov 2001 16:43:57 +0900 diff --git a/debian/control b/debian/control index 9b56376..083ce05 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,10 @@ Source: pbuilder Section: devel Priority: extra Maintainer: Junichi Uekawa <dancer@debian.org> -Build-Depends: debhelper (>> 3.0.0), dummy-error-package | gcc, textutils [!i386], mig [hurd-i386] +Build-Depends-Indep: debhelper (>> 3.0.0), dummy-error-package | gcc, + textutils [!i386], mig [hurd-i386], + mawk +Build-Depends: shellutils Build-Conflicts: dummy-nonexistent-package Standards-Version: 3.5.6 diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 42e9728..01ab582 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -56,8 +56,8 @@ function checkbuilddep_internal () { # Use this function to fulfill the dependency (almost) local ARCH=$(dpkg --print-architecture) echo " -> Attempting to parse the build-deps by myself" - for INSTALLPKGMULTI in $(grep "^Build-Depends\(-Indep\|\): " "$BUILDPLACE/"tmp/buildd/*/debian/control | \ - sed 's/^[^:]*: \(.*\)$/\1/' | \ + for INSTALLPKGMULTI in $(awk '/^[^ ]*:/{p=0}/^Build-Depends:/{p=1} /^Build-Depends-Indep:/{p=1} {if(p) {print $0}}' < "$BUILDPLACE/"tmp/buildd/*/debian/control | \ + sed 's/^[^:]*: //' | \ tr " " "/" | \ awk 'BEGIN{RS=","} {print}'); do echo " -> Considering "$(echo $INSTALLPKGMULTI | tr "/" " " | awk '{print $1}' ) @@ -106,8 +106,8 @@ function checkbuilddep_internal () { exit 1 fi done; - for INSTALLPKG in $(grep "^Build-Conflicts\(-Indep\|\): " "$BUILDPLACE/"tmp/buildd/*/debian/control | \ - sed 's/^[^:]*: \(.*\)$/\1/' | \ + for INSTALLPKG in $(awk '/^[^ ]*:/{p=0}/^Build-Depends:/{p=1} /^Build-Depends-Indep:/{p=1} {if(p) {print $0}}' < "$BUILDPLACE/"tmp/buildd/*/debian/control | \ + sed 's/^[^:]*: //' | \ tr " " "/" | \ awk 'BEGIN{RS=","} {print}'); do echo " -> Considering "$(echo $INSTALLPKG | tr "/" " " | awk '{print $1}' ) |