diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-02-02 14:16:14 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-02-02 14:16:14 +0000 |
| commit | 6a7a064498b1cb5174164ffbc1db710bd5bb42dc (patch) | |
| tree | 208924cd7d9d5a803c6ac73245a95bfb5436d70c | |
| parent | 76ca012a3b767e66a7dcaae417cbb98628d9e512 (diff) | |
| download | tor-6a7a064498b1cb5174164ffbc1db710bd5bb42dc.tar.gz tor-6a7a064498b1cb5174164ffbc1db710bd5bb42dc.zip | |
Backport from 0.2.0.18-alpha + 1: We now use the shipped images on mipsel and
sparc (in addition to s390) because fig2dev segfaults on those archs (re
#457568).
svn:r13359
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9978dcd6d8..458d9ea556 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tor (0.1.2.19-2) unstable; urgency=low + + * Backport from 0.2.0.18-alpha + 1: We now use the shipped images + on mipsel and sparc (in addition to s390) because fig2dev segfaults + on those archs (re #457568). + + -- Peter Palfrader <weasel@debian.org> Sat, 2 Feb 2008 15:14:23 +0100 + tor (0.1.2.19-1) unstable; urgency=low * New upstream version. diff --git a/debian/rules b/debian/rules index c0695d065e..9ac9da1706 100755 --- a/debian/rules +++ b/debian/rules @@ -92,7 +92,7 @@ build-stamp: config.status @echo # XXX - # So, gs-gpl on s390 is broken (#321435) and fails to properly build + # So, gs-gpl on s390 is broken (#457568) and fails to properly build # .pdf files from .fig files using fig2dev. Therefore we ship them # until this bug is fixed. # @@ -100,7 +100,9 @@ build-stamp: config.status # # the hexdumps were built using something like # perl -e 'while (<>) { print unpack ("H*", $_); }' interaction.pdf | fold > hexdump-interaction.pdf - if [ "$(DEB_BUILD_GNU_TYPE)" = "s390-linux-gnu" ]; then \ + if [ "$(DEB_BUILD_GNU_TYPE)" = "s390-linux-gnu" ] || \ + [ "$(DEB_BUILD_GNU_TYPE)" = "sparc-linux-gnu" ] || \ + [ "$(DEB_BUILD_GNU_TYPE)" = "mipsel-linux" ]; then \ cd doc/design-paper; \ fig2dev -L pdf cell-struct.fig cell-struct.pdf || \ ( echo "** Using shipped pdf file because fig2dev failed"; \ |