[or-cvs] r13359: Backport from 0.2.0.18-alpha + 1: We now use the shipped ima (tor/branches/tor-0_1_2-patches/debian)

[weasel at seul.org]

Author: weasel
Date: 2008-02-02 09:16:14 -0500 (Sat, 02 Feb 2008)
New Revision: 13359

Modified:
   tor/branches/tor-0_1_2-patches/debian/changelog
   tor/branches/tor-0_1_2-patches/debian/rules
Log:
Backport from 0.2.0.18-alpha + 1:  We now use the shipped images on mipsel and
sparc (in addition to s390) because fig2dev segfaults on those archs (re
#457568).


Modified: tor/branches/tor-0_1_2-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_1_2-patches/debian/changelog	2008-02-02 14:13:51 UTC (rev 13358)
+++ tor/branches/tor-0_1_2-patches/debian/changelog	2008-02-02 14:16:14 UTC (rev 13359)
@@ -1,3 +1,11 @@
+tor (0.1.2.19-2) unstable; urgency=low
+
+  * Backport from 0.2.0.18-alpha + 1:  We now use the shipped images
+    on mipsel and sparc (in addition to s390) because fig2dev segfaults
+    on those archs (re #457568).
+
+ -- Peter Palfrader <weasel at debian.org>  Sat,  2 Feb 2008 15:14:23 +0100
+
 tor (0.1.2.19-1) unstable; urgency=low
 
   * New upstream version.

Modified: tor/branches/tor-0_1_2-patches/debian/rules
===================================================================
--- tor/branches/tor-0_1_2-patches/debian/rules	2008-02-02 14:13:51 UTC (rev 13358)
+++ tor/branches/tor-0_1_2-patches/debian/rules	2008-02-02 14:16:14 UTC (rev 13359)
@@ -92,7 +92,7 @@
 	@echo
 
 	# XXX
-	# So, gs-gpl on s390 is broken (#321435) and fails to properly build
+	# So, gs-gpl on s390 is broken (#457568) and fails to properly build
 	# .pdf files from .fig files using fig2dev.  Therefore we ship them
 	# until this bug is fixed.
 	#
@@ -100,7 +100,9 @@
 	#
 	# 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" ]; then \
+	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; \
 		fig2dev -L pdf cell-struct.fig cell-struct.pdf || \
 			( echo "** Using shipped pdf file because fig2dev failed"; \