[or-cvs] r13871: Merge r13870: Work around fig2dev failing to build the image (tor/branches/tor-0_2_0-patches/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-03-05 03:50:03 -0500 (Wed, 05 Mar 2008)
New Revision: 13871

Modified:
   tor/branches/tor-0_2_0-patches/debian/changelog
   tor/branches/tor-0_2_0-patches/debian/rules
Log:
Merge r13870: Work around fig2dev failing to build the images on all archs

Modified: tor/branches/tor-0_2_0-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/changelog	2008-03-05 08:48:51 UTC (rev 13870)
+++ tor/branches/tor-0_2_0-patches/debian/changelog	2008-03-05 08:50:03 UTC (rev 13871)
@@ -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 at debian.org>  Wed,  5 Mar 2008 09:47:53 +0100
+
 tor (0.2.0.21-rc-1) experimental; urgency=low
 
   * New upstream version.

Modified: tor/branches/tor-0_2_0-patches/debian/rules
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/rules	2008-03-05 08:48:51 UTC (rev 13870)
+++ tor/branches/tor-0_2_0-patches/debian/rules	2008-03-05 08:50:03 UTC (rev 13871)
@@ -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