[or-cvs] r14609: Work around fig2dev failing to build the images on all archs (tor/branches/tor-0_1_2-patches/debian)

[weasel@xxxxxxxx]

Author: weasel
Date: 2008-05-14 09:01:20 -0400 (Wed, 14 May 2008)
New Revision: 14609

Modified:
   tor/branches/tor-0_1_2-patches/debian/changelog
   tor/branches/tor-0_1_2-patches/debian/rules
Log:
Work around fig2dev failing to build the images on all archs - backport from 0.2.0.22-rc-1 (re #457568).


Modified: tor/branches/tor-0_1_2-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_1_2-patches/debian/changelog	2008-05-13 17:04:45 UTC (rev 14608)
+++ tor/branches/tor-0_1_2-patches/debian/changelog	2008-05-14 13:01:20 UTC (rev 14609)
@@ -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@xxxxxxxxxx>  Sun,  3 Feb 2008 21:53:04 +0100
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed, 14 May 2008 15:00:47 +0200
 
 tor (0.1.2.19-2) unstable; urgency=low
 

Modified: tor/branches/tor-0_1_2-patches/debian/rules
===================================================================
--- tor/branches/tor-0_1_2-patches/debian/rules	2008-05-13 17:04:45 UTC (rev 14608)
+++ tor/branches/tor-0_1_2-patches/debian/rules	2008-05-14 13:01:20 UTC (rev 14609)
@@ -100,17 +100,15 @@
 	#
 	# 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