[skycat] 07/08: Use the system libwcstools instead of the convienience copy

Ole Streicher olebole-guest at alioth.debian.org
Sat Aug 10 12:07:06 UTC 2013


This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository skycat.

commit bbb47772e971f8e4bd4f999ca749a06f74e498ea
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Aug 10 13:48:26 2013 +0200

    Use the system libwcstools instead of the convienience copy
---
 debian/control                    |    1 +
 debian/patches/series             |    1 +
 debian/patches/use_wcstools.patch |   25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/debian/control b/debian/control
index 7b5e48d..6362745 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: blt-dev (>= 2.4z),
                itcl3,
                itk3,
                libcfitsio3-dev,
+               libwcstools-dev,
                tcl-dev (>= 8.5),
                tk-dev (>= 8.5)
 Standards-Version: 3.9.4
diff --git a/debian/patches/series b/debian/patches/series
index 358fca1..729443d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_build_problems.patch
 use_std_blt.patch
 fhs.patch
+use_wcstools.patch
diff --git a/debian/patches/use_wcstools.patch b/debian/patches/use_wcstools.patch
new file mode 100644
index 0000000..5096fee
--- /dev/null
+++ b/debian/patches/use_wcstools.patch
@@ -0,0 +1,25 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use the system libwcstools instead of the convienience copy
+--- a/astrotcl/configure.in
++++ b/astrotcl/configure.in
+@@ -83,16 +83,16 @@
+ #-----------------------------------------------------------------------
+ 
+ changequote(<<, >>)
+-csources=`cd $srcdir; echo generic/*.[Cc] press/*.[Cc] libwcs/*.[Cc]`
++csources=`cd $srcdir; echo generic/*.[Cc] press/*.[Cc]`
+ changequote([, ])
+-cheaders=`cd $srcdir; echo generic/*.h press/*.h libwcs/*.h`
+-cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I$srcdir/libwcs"
++cheaders=`cd $srcdir; echo generic/*.h press/*.h`
++cincludes="-I$srcdir/../tclutil/generic -I$srcdir/generic -I$srcdir/press -I/usr/include/wcstools"
+ tclsources=`cd $srcdir; ls library/*.tcl | fgrep -v mkIndex.tcl`
+ 
+ TEA_ADD_SOURCES([${csources}])
+ TEA_ADD_HEADERS([${cheaders}])
+ TEA_ADD_INCLUDES([$cincludes])
+-TEA_ADD_LIBS([$tclutil_BUILD_LIB_SPEC ${BLT_LIB_SPEC} ${CFITSIO_LIB_SPEC}])
++TEA_ADD_LIBS([$tclutil_BUILD_LIB_SPEC ${BLT_LIB_SPEC} ${CFITSIO_LIB_SPEC} -lwcstools])
+ TEA_ADD_CFLAGS([])
+ TEA_ADD_STUB_SOURCES([])
+ TEA_ADD_TCL_SOURCES([${tclsources}])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/skycat.git



More information about the debian-science-commits mailing list