[SCM] Tcl interface to FITS Files branch, debian, updated. fca47036be6d2253d385af88166de623c7f31a62
Ole Streicher
debian at liska.ath.cx
Wed Aug 22 15:55:15 UTC 2012
The following commit has been merged in the debian branch:
commit fca47036be6d2253d385af88166de623c7f31a62
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Aug 22 17:54:45 2012 +0200
Reorder the patches so that the most important one come first
diff --git a/debian/patches/cfitsio_header.patch b/debian/patches/cfitsio_header.patch
index 7d398a7..3a3dc6f 100644
--- a/debian/patches/cfitsio_header.patch
+++ b/debian/patches/cfitsio_header.patch
@@ -127,7 +127,7 @@ Description: Install cfitsio header files that were not in the cfitsio
+ int nNodes;
+ int nNodesAlloc;
+ int resultNode;
-+
++
+ long firstRow;
+ long nRows;
+
diff --git a/debian/patches/fix_free.patch b/debian/patches/fix_fitsCmds.patch
similarity index 87%
rename from debian/patches/fix_free.patch
rename to debian/patches/fix_fitsCmds.patch
index 8fc9eda..27fc268 100644
--- a/debian/patches/fix_free.patch
+++ b/debian/patches/fix_fitsCmds.patch
@@ -1,7 +1,11 @@
Author: Ole Streicher <debian at liska.ath.cx>
-Description: In fitsTcl_get(), the header is allocated by ffhdr2str(), but is
- freed by ckfree(). This causes crashes if ckfree() is not just a free() alias.
- This patch replaces these ckfree() calls, and also fixes some wrong data types.
+Description: Fix some bugs in fitsCmds.c:
+ * In fitsTcl_get(), the header is allocated by ffhdr2str(), but is freed by
+ ckfree(). This causes crashes if ckfree() is not just a free() alias.
+ * Fix some variable declarations and type casts to match prototypes.
+ * Check the number of arguments in "get translatedKeywords".
+ * Fix status parameter in exxor handling of fits_copy_cell2image() of
+ "get translatedKeywords".
--- a/fitsCmds.c
+++ b/fitsCmds.c
@@ -976,8 +976,8 @@
diff --git a/debian/patches/series b/debian/patches/series
index 5c03b2f..62c64dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-fix_spelling.patch
+fix_fitsCmds.patch
use_shared_cfitsio.patch
cfitsio_header.patch
-fix_compiler_warnings.patch
set_installdir.patch
-fix_free.patch
+fix_compiler_warnings.patch
+fix_spelling.patch
--
Tcl interface to FITS Files
More information about the debian-science-commits
mailing list