[SCM] General FITS file browser/editor/plotter with a gui branch, debian, updated. 26639efb3f08bb6ead7b45433aeb0e31359a256d
Ole Streicher
debian at liska.ath.cx
Sun Jul 29 18:18:46 UTC 2012
The following commit has been merged in the debian branch:
commit 9393fbee61e1e5789c33c301a7f2af464c83bb67
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Jul 29 19:31:59 2012 +0200
Create a tcl package for POW
diff --git a/debian/patches/create_package.patch b/debian/patches/create_package.patch
new file mode 100644
index 0000000..075a1f0
--- /dev/null
+++ b/debian/patches/create_package.patch
@@ -0,0 +1,72 @@
+--- a/tcltk/pow/POWplot.tcl
++++ b/tcltk/pow/POWplot.tcl
+@@ -421,8 +421,8 @@
+ package require Itk
+ package require Iwidgets
+
+-load [glob $POWLIB/libfitstcl.{s\[ol\]*,dylib}]
+-load [glob $POWLIB/libpow.{s\[ol\]*,dylib}]
++package require fitsTcl
++package require POW
+
+ # Look for client/server flag
+
+--- a/tcltk/pow/PowInit.c
++++ b/tcltk/pow/PowInit.c
+@@ -103,7 +103,6 @@
+
+ Tcl_DStringInit(&pow_env);
+
+-
+ interp = interp_instance;
+
+
+@@ -130,9 +129,7 @@
+
+ charptr = Tcl_GetVar2(interp,"env", "POW_LIBRARY", TCL_GLOBAL_ONLY);
+ if( charptr == NULL ) {
+- puts("Could not find defaults.");
+- puts(" Set your POW_LIBRARY environment variable.");
+- return TCL_ERROR;
++ Tcl_DStringAppend(&pow_env,"/usr/share/heasoft/POW", -1);
+ } else {
+ Tcl_DStringAppend(&pow_env,charptr, -1);
+ }
+@@ -219,6 +216,9 @@
+ Pow_CreateCommands(interp);
+
+ Tk_CreateItemType(&tkPowCurveType);
++
++ Tcl_PkgProvide(interp, "POW", "3.0");
++
+ return TCL_OK;
+ }
+
+--- a/tcltk/pow/Makefile.in
++++ b/tcltk/pow/Makefile.in
+@@ -79,6 +79,7 @@
+
+ shared: ${SHARED_OBJ}
+ ${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}
++ echo "pkg_mkIndex . libpow.so" | tclsh
+
+ install:
+ @if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \
+@@ -90,7 +91,7 @@
+ cp ${STATIC_LIB} ${INSTALLDIR}/lib/; \
+ else \
+ echo "cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/"; \
+- cp ${SHARED_LIB} ${INSTALLDIR}/lib/tcltk/POW/; \
++ cp ${SHARED_LIB} pkgIndex.tcl ${INSTALLDIR}/lib/tcltk/POW/; \
+ fi
+ mkdir -p ${INSTALLDIR}/bin
+ @for file in ${SCRIPTS}; do \
+@@ -109,7 +110,7 @@
+ done
+
+ clean:
+- -rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB} so_locations
++ -rm -rf *.o *~ ${STATIC_LIB} ${SHARED_LIB} pkgIndex.tcl so_locations
+
+ distclean: clean
+ -rm -f config.cache config.status config.log Makefile
diff --git a/debian/patches/series b/debian/patches/series
index acb6073..cc6e2dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
pow_update_photo.patch
pow_fix_makefile.patch
+create_package.patch
fv_require.patch
--
General FITS file browser/editor/plotter with a gui
More information about the debian-science-commits
mailing list