diff options
| author | dancer <dancer> | 2001-11-08 02:06:38 +0000 |
|---|---|---|
| committer | dancer <dancer> | 2001-11-08 02:06:38 +0000 |
| commit | 62e2bee0ba947d154b1caf9f1dbc83f58748e5b0 (patch) | |
| tree | d425b5458304933a29ca514e3a38d32a16cd8a9c | |
| parent | 23d64aadabdc9bf4714b84e76be5fcaa1342404b (diff) | |
| download | pbuilder-62e2bee0ba947d154b1caf9f1dbc83f58748e5b0.tar pbuilder-62e2bee0ba947d154b1caf9f1dbc83f58748e5b0.tar.gz | |
updated
| -rw-r--r-- | debian/README.Debian | 5 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | pbuilder-buildpackage | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index 40bd0d8..34f9da1 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -16,6 +16,11 @@ pbuilder build some-random-.dsc would build the file specified by the .dsc file in the chroot. +If you were a Debian Developer doing some development +of Debian packages, you may try invoking pdebuild +from the Debian source directory. + + edit /etc/pbuilderrc if the default doesn't work, especially proxy. I would edit the mirror location too. diff --git a/debian/changelog b/debian/changelog index 2ca052a..1aea9fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,10 @@ pbuilder (0.11) unstable; urgency=low * changed pdebuild logic in obtaining version number, from using grep/cut to sed. * fixed build-conflicts logic. It failed when build-conflicted target did not - exist inside chroot. + already exist inside chroot. + * README.Debian is updated. - -- Junichi Uekawa <dancer@debian.org> Thu, 8 Nov 2001 10:53:09 +0900 + -- Junichi Uekawa <dancer@debian.org> Thu, 8 Nov 2001 11:05:29 +0900 pbuilder (0.10) unstable; urgency=low diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage index be017c8..39da331 100755 --- a/pbuilder-buildpackage +++ b/pbuilder-buildpackage @@ -112,6 +112,7 @@ function checkbuilddep_internal () { if echo "$INSTALLPKG" | grep '\[' > /dev/null ; then # this package has arch-conflicts. if checkbuilddep_archdeps "$INSTALLPKG" "$ARCH"; then + echo "I: Ignoring other-arch" continue; fi fi @@ -120,18 +121,20 @@ function checkbuilddep_internal () { if ! checkbuilddep_versiondeps $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') \ $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\1/') \ $(echo "$INSTALLPKG" | tr "/" " " | sed 's/^.*(\(<<\|<=\|>=\|=\|<\|>>\|>\)[ ]*\(.*\)).*$/\2/'); then - echo " -> Satisfies version, not trying" + echo "I: Satisfies version, not trying" continue; fi fi - - if $CHROOTEXEC usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}'); then + # if package exists, remove it. + if $CHROOTEXEC usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') 2>&1 | grep ^Package: > /dev/null; then if ! $CHROOTEXEC usr/bin/apt-get -y remove $(echo "$INSTALLPKG" | tr "/" " " | awk '{print $1}') ; then - echo Could not satisfy build-conflicts + echo "E: Could not satisfy build-conflicts" >&2 abortingfunction exit 1 fi + else + echo "I:" fi done } |