diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-05-14 13:01:20 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-05-14 13:01:20 +0000 |
| commit | a2164245c08324cb152eda8c8e63b46c85a57f9e (patch) | |
| tree | c6c7725784145b24f324fcc1b01aaf10ca0fe604 | |
| parent | 2bed102003307e7d80c1b7f4dd50247bec491a2b (diff) | |
| download | tor-a2164245c08324cb152eda8c8e63b46c85a57f9e.tar.gz tor-a2164245c08324cb152eda8c8e63b46c85a57f9e.zip | |
Work around fig2dev failing to build the images on all archs - backport from 0.2.0.22-rc-1 (re #457568).
svn:r14609
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 55be0a2723..cca336e3ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ tor (0.1.2.19-3) unstableunreleased; urgency=low * It's 2008. Now is the time to add copyright statements for 2007. + * Work around fig2dev failing to build the images on all archs - + backport from 0.2.0.22-rc-1 (re #457568). - -- Peter Palfrader <weasel@debian.org> Sun, 3 Feb 2008 21:53:04 +0100 + -- Peter Palfrader <weasel@debian.org> Wed, 14 May 2008 15:00:47 +0200 tor (0.1.2.19-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 9ac9da1706..dc836cafc2 100755 --- a/debian/rules +++ b/debian/rules @@ -100,17 +100,15 @@ 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" ] || \ - [ "$(DEB_BUILD_GNU_TYPE)" = "sparc-linux-gnu" ] || \ - [ "$(DEB_BUILD_GNU_TYPE)" = "mipsel-linux" ]; then \ - cd doc/design-paper; \ + # + # And it fails on a bunch of other archs too. + cd doc/design-paper; \ fig2dev -L pdf cell-struct.fig cell-struct.pdf || \ ( echo "** Using shipped pdf file because fig2dev failed"; \ perl -e 'while (<>) { chomp; print pack ("H*", $$_); }' ../../debian/hexdump-cell-struct.pdf > cell-struct.pdf ); \ fig2dev -L pdf interaction.fig interaction.pdf || \ ( echo "** Using shipped pdf file because fig2dev failed"; \ perl -e 'while (<>) { chomp; print pack ("H*", $$_); }' ../../debian/hexdump-interaction.pdf > interaction.pdf ); \ - fi # XXX ends make -C doc/design-paper tor-design.ps tor-design.pdf |