[SCM] image display tool for astronomy branch, debian, updated. a2450b3f4709d062012b2b7956ed9f8ef50031d6

Ole Streicher debian at liska.ath.cx
Thu Jun 7 12:41:06 UTC 2012


The following commit has been merged in the debian branch:
commit a2450b3f4709d062012b2b7956ed9f8ef50031d6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 7 14:40:29 2012 +0200

    Remove linking to ast_err: ds9 uses its own implementation.

diff --git a/debian/patches/use_external_libs.patch b/debian/patches/use_external_libs.patch
index 4d615d5..d51f24c 100644
--- a/debian/patches/use_external_libs.patch
+++ b/debian/patches/use_external_libs.patch
@@ -88,9 +88,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
 -	-ldl -lpthread 
 -	rm -f libstdc++.a
 +	$(CXX) $(OPTS) $(LDFLAGS) -o ds9Base ds9.o tkAppInit.o ../lib/libsaotk.a \
-+	-Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err -lstarlink_ast_grf3d \
++	-Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err \
 +	-lstdc++ -Wl,-Bstatic -L../lib -lsaotk -lhcomp -lrice -lplio \
-+	-liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/blt3.0 -lBLTX30 -lBLTCore30 \
++	-liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/blt3.0.1 -lBLTX30 -lBLTCore30 \
 +	-lwcstools -lfuntools  -ltk -ltcl -lz \
 +	-L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
  endif

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list