[SCM] Tcl interface to FITS Files branch, debian, updated. 373a23afb97367ae7ca3e633328f00d56b10a40e

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 373a23afb97367ae7ca3e633328f00d56b10a40e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Sep 27 15:36:06 2012 +0200

    remove temporary cfitsio test

diff --git a/debian/changelog b/debian/changelog
index 243586a..c6b1f50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-tcl-fitstcl (2.3-2~exp1) experimental; urgency=low
+tcl-fitstcl (2.3-2) unstable; urgency=low
 
   * Add kFreeBSD and HURD support
-  * Include a cfitsio test (temporarily, to check FTBS)
+  * Fix FTBS for mips, powerpc, s390, sparc
 
  -- Ole Streicher <debian at liska.ath.cx>  Tue, 25 Sep 2012 14:55:00 +0200
 
diff --git a/debian/rules b/debian/rules
index 6f3ab6e..8dbf5e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- --with-tcl-includes=/usr/include/tcl
 
 override_dh_auto_test:
-	( cd debian/tests; \
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -I/usr/include/tcl -o fitssize fitssize.c -lcfitsio; \
-	./fitssize; \
-	rm -f fitssize; \
-	TCLLIBPATH=../.. tclsh all.tcl)
+	( cd debian/tests; TCLLIBPATH=../.. tclsh all.tcl)
 
 override_dh_installchangelogs:
 	dh_installchangelogs ReleaseNotes
diff --git a/debian/tests/fitssize.c b/debian/tests/fitssize.c
deleted file mode 100644
index 88de9ea..0000000
--- a/debian/tests/fitssize.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* gcc fitssize.c -lcfitsio -o fitssize */
-
-#include "../../fitsTclInt.h"
-#include <sys/stat.h>
-#include <unistd.h>
-
-int status = 0;
-
-void create_fits(const char *fname) {
-    fitsfile *fptr;
-    long naxes[2] = { 32, 32 };
-    short array[32][32];
-
-    memset(array, 0, sizeof(short)* naxes[0]*naxes[1]);
-
-    fits_create_file(&fptr, fname, &status);
-    fits_create_img(fptr, SHORT_IMG, 2, naxes, &status);
-    fits_write_img(fptr, TSHORT, 1, naxes[0] * naxes[1], array[0], &status);
-    fits_close_file(fptr, &status);
-}
-
-LONGLONG get_size(const char *fname) {
-    fitsfile *infptr;
-    LONGLONG filesize;
-    fits_open_file(&infptr, fname, READONLY, &status);
-    filesize = infptr->Fptr->filesize;
-    fits_close_file(infptr, &status);
-    return filesize;
-}
-
-int main(void) {
-    char fname[] = "fileXXXXXX";
-    LONGLONG fitssize;
-    struct stat sbuf;
-    close(mkstemp(fname));
-    unlink(fname);
-
-    create_fits(fname);
-    fitssize = get_size(fname);
-    stat(fname, &sbuf);
-    unlink(fname);
-
-    printf("CFITSIO size check: cfitsio = %li;  stat = %li\n", (long)fitssize, (long)sbuf.st_size);
-    printf("(long long):   %lld * 2880\n",(long long)(fitssize/2880));
-    printf("no cast; %%ld:  %ld * 2880\n",fitssize/2880);
-    printf("no cast; %%lld: %lld * 2880\n",fitssize/2880);
-    printf("sizeof(long long) = %lu sizeof(LONGLONG) = %lu\n",sizeof(long long), sizeof(LONGLONG));
-    if (fitssize != (long)sbuf.st_size)
-	printf("*** CFITSIO reported wrong length! ***\n");
-    if (status)
-	fits_report_error(stdout, status);
-    return status;
-}

-- 
Tcl interface to FITS Files