Merge r13870: Work around fig2dev failing to build the images on all archs

svn:r13871
This commit is contained in:
Peter Palfrader 2008-03-05 08:50:03 +00:00
parent 517bc3dc64
commit 1cdf610622
2 changed files with 10 additions and 5 deletions

7
debian/changelog vendored
View File

@ -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.

8
debian/rules vendored
View File

@ -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