diff options
| author | Peter Palfrader <peter@palfrader.org> | 2008-03-05 08:50:03 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2008-03-05 08:50:03 +0000 |
| commit | 1cdf610622325248456d0a8b05e1514e41bc8e2c (patch) | |
| tree | 841b9de213e3b2f2bc3c7d296ba9a0b00515d030 | |
| parent | 517bc3dc64ee1abaf18c214e4425c451f92f1fef (diff) | |
| download | tor-1cdf610622325248456d0a8b05e1514e41bc8e2c.tar.gz tor-1cdf610622325248456d0a8b05e1514e41bc8e2c.zip | |
Merge r13870: Work around fig2dev failing to build the images on all archs
svn:r13871
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d749cb3cf1..748e645275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tor (0.2.0.21-rc-+svn) XXperimental; urgency=low + + * Work around fig2dev failing to build the images on all archs + (re #457568). + + -- Peter Palfrader <weasel@debian.org> Wed, 5 Mar 2008 09:47:53 +0100 + tor (0.2.0.21-rc-1) experimental; urgency=low * New upstream version. 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 |