[SCM] image display tool for astronomy branch, debian, updated. 9abc52a03334aab6da35b88cfb47cbfa7db0d777
Ole Streicher
debian at liska.ath.cx
Fri Jun 8 15:28:20 UTC 2012
The following commit has been merged in the debian branch:
commit 9abc52a03334aab6da35b88cfb47cbfa7db0d777
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Jun 8 17:27:35 2012 +0200
Changes to make it compile, build, and start
diff --git a/debian/clean b/debian/clean
index 64552ed..473d016 100644
--- a/debian/clean
+++ b/debian/clean
@@ -5,11 +5,12 @@ ds9/ds9tk.h
ds9/ds9.1
bin/ds9
make.include
-blt3.0/demos/Makefile
-blt3.0/library/AFM/Makefile
-blt3.0/library/Makefile
-blt3.0/man/Makefile
-blt3.0/src/Makefile
-blt3.0/src/bltHash.h
-blt3.0/src/config.h
-blt3.0/src/shared/Makefile
+blt3.0.1/demos/Makefile
+blt3.0.1/library/afm/Makefile
+blt3.0.1/library/Makefile
+blt3.0.1/man/Makefile
+blt3.0.1/src/Makefile
+blt3.0.1/src/bltHash.h
+blt3.0.1/src/config.h
+blt3.0.1/src/shared/Makefile
+blt3.0.1/src/*.o
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index 40c7db9..06c7094 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -43,7 +43,7 @@ Description: Instead putting the documentation into the common shared
+set ds9(doc) "/usr/share/doc/saods9-doc"
# tcl modules
- if {![namespace exists msgcat]} {
+ package require msgcat
--- a/src/util.tcl
+++ b/src/util.tcl
@@ -716,7 +716,7 @@
diff --git a/debian/patches/ds9_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index 4dd5191..fca1833 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Make the "-doc" package optional by disabling the help menu
--- a/src/mhelp.tcl
+++ b/src/mhelp.tcl
-@@ -7,7 +7,12 @@ package provide DS9 1.0
+@@ -7,7 +7,12 @@
# Menu
proc HelpMenu {mb} {
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index d51f24c..c224fd5 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -70,7 +70,24 @@ Description: Compile against external libraries of wcstools, funtools, ast,
# if windows, redefine
ifeq ($(OS),windows)
-@@ -354,18 +318,14 @@
+@@ -152,14 +116,9 @@
+
+ all: ds9
+
+-ds9 : null.zip ds9Base $(FILES)
++ds9 : ds9Base $(FILES)
+ $(RM) $@
+- cp ds9Base ds9.zip
+- strip ds9.zip
+- cat null.zip >> ds9.zip
+- cd zipdir; ../../bin/zip -rA9 ../ds9.zip *
+- mv ds9.zip ds9
+- cp ds9 ../bin/.
++ cp ds9Base ../bin/ds9
+
+ debug : null.zip ds9Base $(FILES)
+ $(RM) $@
+@@ -354,18 +313,14 @@
#--------------------------linux
ifneq (,$(findstring linux,$(ARCH)))
@@ -90,7 +107,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
+ $(CXX) $(OPTS) $(LDFLAGS) -o ds9Base ds9.o tkAppInit.o ../lib/libsaotk.a \
+ -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.1 -lBLTX30 -lBLTCore30 \
++ -lxxlib -liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/blt3.0 -lBLTX30 -lBLTCore30 \
+ -lwcstools -lfuntools -ltk -ltcl -lz \
+ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
endif
@@ -254,15 +271,19 @@ Description: Compile against external libraries of wcstools, funtools, ast,
return TCL_ERROR;
--- a/Makefile
+++ b/Makefile
-@@ -282,7 +282,7 @@
+@@ -282,9 +282,9 @@
blt : FORCE
@echo "Installing BLT..."
- cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(BLTFLAGS) --disable-shared --cache-file=$(CACHE)
+- cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_static
+- cp $(BLTDIR)/src/*.a lib/.
+ cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec_prefix $(root) $(BLTFLAGS) --enable-shared --cache-file=$(CACHE)
- cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_static
- cp $(BLTDIR)/src/*.a lib/.
++ cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
++ cp $(BLTDIR)/src/*.so* lib/.
cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
+
+ zlib : FORCE
@@ -299,7 +299,7 @@
tkimg : libtiff
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 22355c0..bd7d7fa 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -18,7 +18,7 @@ Description: Store all files in the usual FHS directories instead of
cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9
debug : ds9Base ds9.zip
-@@ -191,12 +188,9 @@
+@@ -186,12 +183,9 @@
all: ds9
@@ -127,7 +127,7 @@ Description: Store all files in the usual FHS directories instead of
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -189,7 +189,7 @@
+@@ -189,16 +189,9 @@
# set to absolute path so that if -cd command is used,
# so we can still find our files
@@ -135,4 +135,13 @@ Description: Store all files in the usual FHS directories instead of
+set ds9(root) "/usr/share/saods9"
# tcl modules
- if {![namespace exists msgcat]} {
+-if {![namespace exists msgcat]} {
+- source $ds9(root)/tcl8/8.5/msgcat-1.4.3.tm
+-}
+-if {![namespace exists http]} {
+- source $ds9(root)/tcl8/8.4/http-2.7.5.tm
+-}
+-
+ package require msgcat
+ package require http
+ package require xml
diff --git a/debian/patches/iis.patch b/debian/patches/iis.patch
index 61087b0..02ba8de 100644
--- a/debian/patches/iis.patch
+++ b/debian/patches/iis.patch
@@ -18,7 +18,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
#include "iis.h"
#include "xim.h"
-@@ -111,7 +115,7 @@ extern int errno;
+@@ -111,7 +115,7 @@
* UNIX domain socket connection. All three types of server ports are
* simultaneously ready to receive client connections.
*/
@@ -27,7 +27,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
register XimDataPtr xim;
{
int nopen = 0;
-@@ -141,7 +145,7 @@ register XimDataPtr xim;
+@@ -141,7 +145,7 @@
chan = &xim->chan[i];
if (chan->id) {
xim_removeInput (xim, chan->id);
@@ -36,7 +36,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
}
switch (chan->type) {
-@@ -296,7 +300,7 @@ register XimDataPtr xim;
+@@ -296,7 +300,7 @@
fcntl(s, F_SETFD, FD_CLOEXEC);
/* Allocate and fill in i/o channel descriptor. */
@@ -45,7 +45,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
chan->xim = (XtPointer) xim;
chan->type = IO_INET;
chan->datain = s;
-@@ -367,7 +371,7 @@ register XimDataPtr xim;
+@@ -367,7 +371,7 @@
fcntl(s, F_SETFD, FD_CLOEXEC);
/* Allocate and fill in i/o channel descriptor. */
@@ -54,7 +54,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
chan->xim = (XtPointer) xim;
chan->type = IO_UNIX;
chan->datain = s;
-@@ -421,7 +425,7 @@ XtPointer id;
+@@ -421,7 +425,7 @@
} */
/* Allocate and fill in i/o channel descriptor. */
@@ -63,7 +63,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
chan->xim = (XtPointer) xim;
chan->type = chan_port->type;
chan->datain = s;
-@@ -448,7 +452,7 @@ register IoChanPtr chan;
+@@ -448,7 +452,7 @@
close (chan->datain);
if (chan->id) {
xim_removeInput (chan->xim, chan->id);
@@ -72,7 +72,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
}
chan->type = 0;
break;
-@@ -464,7 +468,6 @@ static IoChanPtr
+@@ -464,7 +468,6 @@
get_iochan (xim)
register XimDataPtr xim;
{
@@ -80,7 +80,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
register int i;
for (i=0; i < XtNumber(xim->chan); i++)
-@@ -505,7 +508,7 @@ XtInputId *id_addr;
+@@ -505,7 +508,7 @@
if ((n = chan_read (datain, (char *)&iis, sizeof(iis))) < sizeof(iis)) {
if (n != 0)
fprintf (stderr,
@@ -89,7 +89,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
n, sizeof(iis), errno);
if (n <= 0)
xim_disconnectClient (chan);
-@@ -751,7 +754,7 @@ XtInputId *id_addr;
+@@ -751,7 +754,7 @@
*/
char emsg[SZ_WCSBUF];
char *text;
@@ -98,7 +98,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
memset ((char *)emsg, 0, SZ_WCSBUF);
-@@ -1038,7 +1041,7 @@ int frame;
+@@ -1038,7 +1041,7 @@
/* DECODE_FRAMENO -- Decode encoded IIS register frame number.
*/
@@ -107,7 +107,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
decode_frameno (z)
register int z;
{
-@@ -1391,6 +1394,8 @@ FrameBufPtr fr;
+@@ -1391,6 +1394,8 @@
* elsewhere if needed, our only purpose here is to extract the frame WCS.
*/
@@ -116,7 +116,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
static void
add_mapping (xim, ctran, wcsbuf, fr)
register XimDataPtr xim;
-@@ -1482,8 +1487,7 @@ FrameBufPtr fr;
+@@ -1482,8 +1487,7 @@
/* PRINT_MAPPINGS -- Debug routine to print all mappings on a frame.
*/
@@ -128,7 +128,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
register int i;
--- a/iis/iistcl.C
+++ b/iis/iistcl.C
-@@ -42,6 +42,7 @@ static char* dupstr(const char* str)
+@@ -42,6 +42,7 @@
return copy;
}
@@ -136,7 +136,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
static char* toLower(char* str)
{
char* ptr = str;
-@@ -51,6 +52,7 @@ static char* toLower(char* str)
+@@ -51,6 +52,7 @@
}
return str;
}
@@ -144,7 +144,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
int Iis_Init(Tcl_Interp* interp) {
-@@ -150,7 +152,7 @@ IIS::IIS(Tcl_Interp* intp)
+@@ -150,7 +152,7 @@
xim.chan[i].dataout = 0; // output channel
xim.chan[i].keepalive = 0; // used to keep input fifo ready
xim.chan[i].path[0] = '\0'; // for unix sockets
@@ -155,7 +155,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
}
--- a/iis/xim.C
+++ b/iis/xim.C
-@@ -19,7 +19,7 @@ extern "C" {
+@@ -19,7 +19,7 @@
void iisIO(void* data, int mask)
{
@@ -164,7 +164,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
if (IISDebug)
cerr << "iisIO() " << fd << ' ' << mask << endl;
-@@ -43,7 +43,7 @@ int xim_addInput(XimDataPtr xim, int fd,
+@@ -43,7 +43,7 @@
iis->chan[fd] = chan;
#ifndef __WIN32__
Tcl_CreateFileHandler(fd, TCL_READABLE, (void (*)(void*,int))iisIO,
@@ -175,7 +175,7 @@ Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
#endif
--- a/iis/ximtool.h
+++ b/iis/ximtool.h
-@@ -149,7 +149,7 @@ typedef struct {
+@@ -149,7 +149,7 @@
/* Client IIS I/O channel. */
typedef struct {
XtPointer xim; /* backpointer to xim descriptor */
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index e36d483..bcb022d 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -22,7 +22,7 @@ Description: Avoid compile time warnings in the saotk subsystem
valid_ = 1;
}
-@@ -23,7 +23,7 @@ int OutFitsFile::write(char* d, int s)
+@@ -23,7 +23,7 @@
OutFitsFileGZ::OutFitsFileGZ(const char* fn)
{
@@ -33,7 +33,7 @@ Description: Avoid compile time warnings in the saotk subsystem
--- a/saotk/fitsy++/strm.C
+++ b/saotk/fitsy++/strm.C
-@@ -344,7 +344,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+@@ -344,7 +344,7 @@
if (!(this->pExt_ || (this->pIndex_>0))) {
// we are only looking for a primary image
@@ -42,7 +42,7 @@ Description: Avoid compile time warnings in the saotk subsystem
this->found();
return;
}
-@@ -400,7 +400,7 @@ template<class T> void FitsFitsStream<T>::processExact()
+@@ -400,7 +400,7 @@
this->head_ = NULL;
}
diff --git a/debian/patches/series b/debian/patches/series
index 5a72798..85283f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,5 @@ ds9_use_external_libs.patch
ds9_make_linux.patch
ds9_use_filesystem.patch
ds9_fix_docdir.patch
-ds9_add_about_debian.patch
ds9_optional_doc_package.patch
-
+ds9_add_about_debian.patch
diff --git a/debian/saods9-blt.install b/debian/saods9-blt.install
index ace540d..4c342ce 100644
--- a/debian/saods9-blt.install
+++ b/debian/saods9-blt.install
@@ -1,7 +1,7 @@
lib/libBLT*.so /usr/lib/saods9/blt3.0
-lib/blt3.0/*.tcl /usr/share/saods9/blt3.0
-lib/blt3.0/*.pro /usr/share/saods9/blt3.0
-lib/blt3.0/*.xbm /usr/share/saods9/blt3.0
-lib/blt3.0/*.cur /usr/share/saods9/blt3.0
-lib/blt3.0/afm /usr/share/saods9/blt3.0
-lib/blt3.0/dd_protocols /usr/share/saods9/blt3.0
+blt3.0.1/library/*.tcl /usr/share/saods9/blt3.0
+blt3.0.1/library/*.pro /usr/share/saods9/blt3.0
+blt3.0.1/library/*.xbm /usr/share/saods9/blt3.0
+blt3.0.1/library/*.cur /usr/share/saods9/blt3.0
+blt3.0.1/library/afm /usr/share/saods9/blt3.0
+blt3.0.1/library/dd_protocols /usr/share/saods9/blt3.0
diff --git a/debian/saods9-data.install b/debian/saods9-data.install
index 840b041..9d23579 100644
--- a/debian/saods9-data.install
+++ b/debian/saods9-data.install
@@ -1,3 +1,4 @@
+ds9/zipdir/zvfsmntpt/cmaps /usr/share/saods9/
ds9/zipdir/zvfsmntpt/msgs /usr/share/saods9/
ds9/zipdir/zvfsmntpt/src /usr/share/saods9/
ds9/zipdir/zvfsmntpt/template /usr/share/saods9/
--
image display tool for astronomy
More information about the debian-science-commits
mailing list