[SCM] image display tool for astronomy branch, debian, updated. 1cb694789bac41f4b2db145980abc147128edaf5
Ole Streicher
debian at liska.ath.cx
Wed Jan 11 12:27:57 UTC 2012
The following commit has been merged in the debian branch:
commit 1cb694789bac41f4b2db145980abc147128edaf5
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jan 11 13:26:58 2012 +0100
Add remaining package to be compiled and linked
diff --git a/debian/patches/main-ds9.patch b/debian/patches/main-ds9.patch
index 227508f..40d80a6 100644
--- a/debian/patches/main-ds9.patch
+++ b/debian/patches/main-ds9.patch
@@ -47,17 +47,20 @@
- ../lib/libtk8.5.a \
- ../lib/libtcl8.5.a
+ LIBS = \
-+ /usr/lib/Tktable2.9/libTktable2.9.so \
-+ -lz -lBLT -ltk8.4 -ltcl8.4 \
-+ -L../lib -lsaotk -ltkhtml -ltkmpeg -lsla\
-+ -liis -lcheckdns -lxpa -lcheckdns \
++ -L /usr/lib/Tktable2.10 -lTktable2.10 \
++ -lz -lBLT -ltk -ltcl -lxml2 \
++ -L../lib -lsaotk -ltkhtml -ltkmpeg -lsla -last_pal -last_err -last_grf3d -last_wcslib -last \
++ -liis -lcheckdns -lxpa -lcheckdns -lsignal_ext -lrice -lfuntools -lhcomp -lplio -lwcs -lzvfs \
+ -lgfortran
endif
ifeq ($(OS),windows)
-@@ -391,15 +355,7 @@ endif
+@@ -389,17 +353,9 @@ endif
+ #--------------------------linux
+
ifneq (,$(findstring linux,$(ARCH)))
- ds9Base : $(OBJS) $(LIBS)
+-ds9Base : $(OBJS) $(LIBS)
++ds9Base : $(OBJS)
$(RM) $@
- rm -f libstdc++.a
- ln -s `$(CXX) ${OPTS} -print-file-name=libstdc++.a` .
@@ -68,7 +71,7 @@
- -L$(X11LIB) -lX11 -lXss -lXext -lXft -lXrandr -lXrender \
- -ldl -lpthread -lxml2
- rm -f libstdc++.a
-+ $(CXX) $(OPTS) -o $@ ds9.o ds9tk.o $(LIBS)
++ $(CXX) $(OPTS) -o $@ ds9.o $(LIBS)
endif
#--------------------------darwin
diff --git a/debian/rules b/debian/rules
index 9bdce7e..569c9b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-BUILDPARTS:=dirs checkdns html tkmpeg iis
+BUILDPARTS:=dirs checkdns html tkmpeg iis
+BUILDPARTS+=rice hcompress plio zvfs signal
BUILDPARTS+=xpa ast wcssubs funtools sla saotk ds9
FLAGS = -Wall -g
--
image display tool for astronomy
More information about the debian-science-commits
mailing list