[Python-modules-commits] r25677 - in packages/pyfits/trunk/debian (8 files)
aurel32 at users.alioth.debian.org
aurel32 at users.alioth.debian.org
Tue Aug 27 16:49:10 UTC 2013
Date: Tuesday, August 27, 2013 @ 16:49:08
Author: aurel32
Revision: 25677
* Move fitscheck to a new pyfits-utils package. Change fitscheck
package into a transitional package.
* Add fitsdiff to the pyfits-utils package (Closes: #719775).
Added:
packages/pyfits/trunk/debian/fitsdiff.1
packages/pyfits/trunk/debian/pyfits-utils.dir
packages/pyfits/trunk/debian/pyfits-utils.install
packages/pyfits/trunk/debian/pyfits-utils.manpages
Modified:
packages/pyfits/trunk/debian/changelog
packages/pyfits/trunk/debian/control
packages/pyfits/trunk/debian/fitscheck.1
packages/pyfits/trunk/debian/rules
Modified: packages/pyfits/trunk/debian/changelog
===================================================================
--- packages/pyfits/trunk/debian/changelog 2013-08-26 09:02:07 UTC (rev 25676)
+++ packages/pyfits/trunk/debian/changelog 2013-08-27 16:49:08 UTC (rev 25677)
@@ -1,3 +1,11 @@
+pyfits (1:3.1.2-2) unstable; urgency=low
+
+ * Move fitscheck to a new pyfits-utils package. Change fitscheck
+ package into a transitional package.
+ * Add fitsdiff to the pyfits-utils package (Closes: #719775).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 27 Aug 2013 18:46:40 +0200
+
pyfits (1:3.1.2-1) unstable; urgency=low
[ Aurelien Jarno ]
Modified: packages/pyfits/trunk/debian/control
===================================================================
--- packages/pyfits/trunk/debian/control 2013-08-26 09:02:07 UTC (rev 25676)
+++ packages/pyfits/trunk/debian/control 2013-08-27 16:49:08 UTC (rev 25677)
@@ -15,7 +15,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Provides: ${python:Provides}
-Suggests: fitscheck
+Suggests: pyfits-utils
Description: Python module for reading, writing, and manipulating FITS files
FITS (Flexible Image Transport System) is a data format most used in
astronomy. PyFITS is a Python module for reading, writing, and manipulating
@@ -30,7 +30,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}
Provides: ${python3:Provides}
-Suggests: fitscheck
+Suggests: pyfits-utils
Description: Python3 module for reading, writing, and manipulating FITS files
FITS (Flexible Image Transport System) is a data format most used in
astronomy. PyFITS is a Python module for reading, writing, and manipulating
@@ -43,9 +43,26 @@
Package: fitscheck
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pyfits
+Priority: extra
+Section: oldlibs
+Depends: pyfits-utils, ${misc:Depends}
Breaks: python-pyfits (<< 1:3.0.7-2~)
Replaces: python-pyfits (<< 1:3.0.7-2~)
+Description: transitional package for pyfits-utils
+ FITS (Flexible Image Transport System) is a data format most used in
+ astronomy. PyFITS is a Python module for reading, writing, and manipulating
+ FITS files. The module uses Python's object-oriented features to provide quick,
+ easy, and efficient access to FITS files. The use of Python's array syntax
+ enables immediate access to any FITS extension, header cards, or data items.
+ .
+ This is a dummy transitional package for pyfits-utils and can be
+ safely removed after the installation is complete.
+
+Package: pyfits-utils
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-pyfits
+Breaks: python-pyfits (<< 1:3.0.7-2~), fitscheck (<< 1:3.1.2-1~)
+Replaces: python-pyfits (<< 1:3.0.7-2~), fitscheck (<< 1:3.1.2-1~)
Description: script to detect and fix FITS standards violations
FITS (Flexible Image Transport System) is a data format most used in
astronomy. PyFITS is a Python module for reading, writing, and manipulating
@@ -53,6 +70,4 @@
easy, and efficient access to FITS files. The use of Python's array syntax
enables immediate access to any FITS extension, header cards, or data items.
.
- This package provides a script a command line script based on pyfits for
- verifying and updating the CHECKSUM and DATASUM keywords of FITS files.
- It can also detect and often fix other FITS standards violations.
+ This package provides command line scripts based on pyfits.
Modified: packages/pyfits/trunk/debian/fitscheck.1
===================================================================
--- packages/pyfits/trunk/debian/fitscheck.1 2013-08-26 09:02:07 UTC (rev 25676)
+++ packages/pyfits/trunk/debian/fitscheck.1 2013-08-27 16:49:08 UTC (rev 25677)
@@ -23,7 +23,7 @@
\fB\-h\fR, \fB\-\-help\fR
Display terse usage information (help).
.TP
-\fB\-k\fR [standard | nonstandard | either | none], \fB\-\-checksum\fR=\fI[standard\fR | nonstandard | either | none]
+\fB\-k\fR [\fIstandard\fR | \fInonstandard\fR | \fIeither\fR | \fInone\fR], \fB\-\-checksum\fR=[\fIstandard\fR | \fInonstandard\fR | \fIeither\fR | \fInone\fR]
Choose FITS checksum mode or none. Defaults to standard.
.TP
\fB\-w\fR, \fB\-\-write\fR
Added: packages/pyfits/trunk/debian/fitsdiff.1
===================================================================
--- packages/pyfits/trunk/debian/fitsdiff.1 (rev 0)
+++ packages/pyfits/trunk/debian/fitsdiff.1 2013-08-27 16:49:08 UTC (rev 25677)
@@ -0,0 +1,87 @@
+.TH fitsdiff 1 "August 2013" "fitsdiff" "PyFITS 3.1.2"
+.SH NAME
+fitsdiff \- compare two FITS image files and report the differences in header keywords and data.
+.SH SYNOPSIS
+.B fitsdiff
+[\fIOPTION\fR]... \fIFILE1\fR \fIFILE2\fR
+.SH DESCRIPTION
+.PP
+\fBfitsdiff\fR is a command line script based on pyfits to compare two
+FITS image files and report the differences in header keywords and data.
+.PP
+\fIFILE1\fR and \fIFILE2\fR are the two files to be compared. They may also be
+wild cards, in such cases, they must be enclosed by double or single quotes, or
+they may be directory names. If both are directory names, all files in each of
+the directories will be included; if only one is directory name, then the
+directory name will be prefixed to the file name(s) specified by the other
+argument. For example:
+.TP
+.B "% fitsdiff ""*.fits"" ""/machine/data1""
+.PP
+will compare all FITS files in the current directory to the corresponding files
+in the directory \fI/machine/data1\fR.
+.PP
+If the two files are identical within the specified conditions, it will report
+"No difference is found." If the value(s) of \fI-c\fR and \fI-k\fR takes the form
+\fI\@filename\fR, list is in the text file \fIfilename\fR, and each line in that text
+file contains one keyword.
+.PP
+\fBfitsdiff\fR commandline arguments can also be set using the environment variable
+\fIFITSDIFF_SETTINGS\fR. If the \fIFITSDIFF_SETTINGS\fR environment variable is present,
+each argument present will override the corresponding argument on the
+commandline. This environment variable exists to make it easier to change the
+behavior of \fBfitsdiff\fR on a global level, such as in a set of regression tests.
+.SH GENERIC OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Display terse usage information (help).
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+Produce no output and just return a status code.
+.TP
+\fB\-n\fR \fIINTEGER\fR, \fB\-\-num\-diffs\fR=\fIINTEGER\fR
+Max number of data differences (image pixel or table element) to report per extension (default 10).
+.TP
+\fB\-d\fR \fINUMBER\fR, \fB\-\-difference-tolerance\fR=\fINUMBER\fR
+The relative tolerance for comparison of two numbers,
+specifically two floating point numbers. This applies
+to data in both images and tables, and to floating
+point keyword values in headers (default 0.0).
+.TP
+\fB\-b\fR, \fB\-\-no\-ignore\-blanks\fR
+Don't ignore trailing blanks (whitespace) in string
+values. Otherwise trailing blanks both in header
+keywords/values and in table column values) are not
+treated as significant i.e. without this option 'ABC ' and 'ABC' are considered equivalent.
+.TP
+\fB\-\-no\-ignore\-blank\-cards\fR
+Don't ignore entirely blank cards in headers. Normally \fIfitsdiff\fR does not
+consider blank cards when comparing headers, but this will ensure that even blank
+cards match up.
+.TP
+\fB\-o\fR \fIFILE\fR, \fB\-\-output\-file\fR=\fIFILE\fR
+Output results to this file; otherwise results are printed to stdout.
+.SH "HEADER COMPARISON OPTIONS"
+.TP
+\fB\-k\fR \fIKEYWORDS\fR, \fB\-\-ignore\-keywords\fR=\fIKEYWORDS\fR
+Comma-separated list of keywords not to be compared.
+Keywords may contain wildcard patterns. To exclude
+all keywords, use "*"; make sure to have double or
+single quotes around the asterisk.
+.TP
+\fB\-c\fR \fIKEYWORDS\fR, \fB\-\-ignore\-comments\fR=\fIKEYWORDS\fR
+Comma-separated list of keywords whose comments will not be compared.
+Wildcards may be used as with \fI\-\-ignore-keywords\fR.
+.SH "TABLE COMPARISON OPTIONS"
+.TP
+\fB\-f\fR \fICOLUMNS\fR, \fB\-\-ignore\-fields\fR=\fICOLUMNS\fR
+Comma-separated list of fields (i.e. columns) not to be compared.
+All columns may be excluded using "*" as with \fI\-\-ignore-keywords\fR.
+.SH "EXAMPLES"
+.B "% fitsdiff -k filename,filtnam1 -n 5 -d 1.e-6 test1.fits test2"
+.br
+This command will compare files \fItest1.fits\fR and \fItest2.fits\fR, report maximum of 5
+different pixels values per extension, only report data values larger than
+1.e-6 relative to each other, and will neglect the different values of
+keywords \fIFILENAME\fR and \fIFILTNAM1\fR (or their very existence).
+
Added: packages/pyfits/trunk/debian/pyfits-utils.dir
===================================================================
--- packages/pyfits/trunk/debian/pyfits-utils.dir (rev 0)
+++ packages/pyfits/trunk/debian/pyfits-utils.dir 2013-08-27 16:49:08 UTC (rev 25677)
@@ -0,0 +1 @@
+usr/bin
Added: packages/pyfits/trunk/debian/pyfits-utils.install
===================================================================
--- packages/pyfits/trunk/debian/pyfits-utils.install (rev 0)
+++ packages/pyfits/trunk/debian/pyfits-utils.install 2013-08-27 16:49:08 UTC (rev 25677)
@@ -0,0 +1,2 @@
+scripts/fitscheck usr/bin
+scripts/fitsdiff usr/bin
Added: packages/pyfits/trunk/debian/pyfits-utils.manpages
===================================================================
--- packages/pyfits/trunk/debian/pyfits-utils.manpages (rev 0)
+++ packages/pyfits/trunk/debian/pyfits-utils.manpages 2013-08-27 16:49:08 UTC (rev 25677)
@@ -0,0 +1,2 @@
+debian/fitscheck.1
+debian/fitsdiff.1
Modified: packages/pyfits/trunk/debian/rules
===================================================================
--- packages/pyfits/trunk/debian/rules 2013-08-26 09:02:07 UTC (rev 25676)
+++ packages/pyfits/trunk/debian/rules 2013-08-27 16:49:08 UTC (rev 25677)
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
# Get flags from dpkg-buildflags
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
@@ -48,6 +51,7 @@
dh_testroot
dh_clean -k
dh_installdirs
+ dh_install --sourcedir=$(CURDIR)
# Python2 version
set -e; \
@@ -67,12 +71,6 @@
rm -rf $(CURDIR)/debian/python3-pyfits/usr/bin ; \
done
- # Install fitscheck
- install -m 755 -d $(CURDIR)/debian/fitscheck/usr/bin
- install -m 644 $(CURDIR)/scripts/fitscheck $(CURDIR)/debian/fitscheck/usr/bin
- install -m 755 -d $(CURDIR)/debian/fitscheck/usr/share/man/man1
- install -m 644 $(CURDIR)/debian/fitscheck.1 $(CURDIR)/debian/fitscheck/usr/share/man/man1
-
touch $@
# Build architecture-independent files here.
@@ -80,6 +78,7 @@
dh_testdir
dh_testroot
dh_installdocs -i
+ dh_installman -i
dh_installexamples -i
dh_installchangelogs -i debian/CHANGES
dh_python2 -i
More information about the Python-modules-commits
mailing list