diff options
| author | dancer <dancer> | 2002-02-17 21:40:27 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2002-02-17 21:40:27 +0000 |
| commit | 14e9f5b066fa57e2297f4690fbb49d5f849f6b03 (patch) | |
| tree | 241ef2a2ee76025eb71aff9d62ae35d79e3a32e3 | |
| parent | 5e3caa3d4eb6ebd2df30f9a1079c385d214a823f (diff) | |
| download | pbuilder-14e9f5b066fa57e2297f4690fbb49d5f849f6b03.tar pbuilder-14e9f5b066fa57e2297f4690fbb49d5f849f6b03.tar.gz | |
add support for versioned build-deps with space in front.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 8 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2002-02-18 Junichi Uekawa <dancer@debian.org> + + * pbuilder-buildpackage: Can now handle ([SPACE]<< version) + version relationship. Needed for arpack + 2002-02-16 Junichi Uekawa <dancer@debian.org> * pbuilder-buildpackage: fix ordering, to make the passwd creation work diff --git a/debian/changelog b/debian/changelog index 97bbe5d..67fd650 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ pbuilder (0.23) unstable; urgency=low the chroot. (please test) -- can't do. * EXTRAPACKAGES takes effect within the build target. (please test) * Make adding fakeroot inside the chroot the default. + * handle ( <<version) version dependency format. Space should be + allowed there. (please test) - -- Junichi Uekawa <dancer@debian.org> Sat, 16 Feb 2002 20:58:10 +0900 + -- Junichi Uekawa <dancer@debian.org> Mon, 18 Feb 2002 06:37:27 +0900 pbuilder (0.22) unstable; urgency=low diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index 7b231e2..fb2610b 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -97,8 +97,8 @@ function checkbuilddep_internal () { if echo "$INSTALLPKG" | grep '[(]' > /dev/null; then #echo "Debug: $INSTALLPKG" if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \ - $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ - $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/') ; then + $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ + $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/') ; then echo " -> Does not satisfy version, not trying" continue; fi @@ -149,8 +149,8 @@ function checkbuilddep_internal () { if echo "$INSTALLPKG" | grep '[(]' > /dev/null ; then # this package has version-conflicts if ! checkbuilddep_versiondeps ${CURRENTREALPKGNAME} \ - $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ - $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/'); then + $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ + $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*([ ]*\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/'); then echo "I: Satisfies version, not trying" continue; fi |