[Python-modules-commits] r22060 - in packages/pyfits/trunk/debian (6 files)
aurel32 at users.alioth.debian.org
aurel32 at users.alioth.debian.org
Mon Jun 4 22:14:53 UTC 2012
Date: Monday, June 4, 2012 @ 22:14:48
Author: aurel32
Revision: 22060
* New upstream version (Closes: #645203).
* Bump Standards-Version to 3.9.3 (no changes).
* Correctly pass CFLAGS, CPPFLAGS and LDFLAGS to build with hardening
support.
* Add build-arch and build-indep targets.
Added:
packages/pyfits/trunk/debian/fitscheck.1
Modified:
packages/pyfits/trunk/debian/changelog
packages/pyfits/trunk/debian/control
packages/pyfits/trunk/debian/patches/01-zlib.diff
packages/pyfits/trunk/debian/rules
Deleted:
packages/pyfits/trunk/debian/README.source
Deleted: packages/pyfits/trunk/debian/README.source
===================================================================
--- packages/pyfits/trunk/debian/README.source 2012-06-04 19:50:05 UTC (rev 22059)
+++ packages/pyfits/trunk/debian/README.source 2012-06-04 22:14:48 UTC (rev 22060)
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- break
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: packages/pyfits/trunk/debian/changelog
===================================================================
--- packages/pyfits/trunk/debian/changelog 2012-06-04 19:50:05 UTC (rev 22059)
+++ packages/pyfits/trunk/debian/changelog 2012-06-04 22:14:48 UTC (rev 22060)
@@ -1,10 +1,13 @@
-pyfits (1:2.4.0-2) UNRELEASED; urgency=low
+pyfits (1:3.0.7-1) unstable; urgency=low
- * Fix /usr/bin/fitscheck to get a python shebang instead of a python2.7
- one.
+ * New upstream version (Closes: #645203).
+ * Bump Standards-Version to 3.9.3 (no changes).
+ * Correctly pass CFLAGS, CPPFLAGS and LDFLAGS to build with hardening
+ support.
+ * Add build-arch and build-indep targets.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Tue, 05 Jun 2012 00:14:12 +0200
- -- Aurelien Jarno <aurel32 at debian.org> Thu, 05 Apr 2012 16:23:21 +0200
-
pyfits (1:2.4.0-1) unstable; urgency=low
* New upstream version.
Modified: packages/pyfits/trunk/debian/control
===================================================================
--- packages/pyfits/trunk/debian/control 2012-06-04 19:50:05 UTC (rev 22059)
+++ packages/pyfits/trunk/debian/control 2012-06-04 22:14:48 UTC (rev 22060)
@@ -3,16 +3,18 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), quilt, python-numpy, python-all-dev (>= 2.3.5-7), python-support (>= 0.3), zlib1g-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), zlib1g-dev, python-all-dev (>= 2.6.6-3~), python-setuptools, python-d2to1, python-stsci.distutils, python-numpy
+X-Python-Version: >= 2.5
+Standards-Version: 3.9.3
Homepage: http://www.stsci.edu/resources/software_hardware/pyfits
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyfits/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyfits/trunk/
Package: python-pyfits
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Provides: ${python:Provides}
+Suggests: fitscheck
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
Added: packages/pyfits/trunk/debian/fitscheck.1
===================================================================
--- packages/pyfits/trunk/debian/fitscheck.1 (rev 0)
+++ packages/pyfits/trunk/debian/fitscheck.1 2012-06-04 22:14:48 UTC (rev 22060)
@@ -0,0 +1,71 @@
+.TH fitscheck 1 "June 2012" "fitscheck" "PyFITS 3.0.7"
+.SH NAME
+fitscheck \- script to detect and fix FITS standards violations
+.SH SYNOPSIS
+.B fitscheck
+[\fIOPTION\fR]... [\fIFILE\fR]...
+.SH DESCRIPTION
+.PP
+\fBfitscheck\fR is a command line script based on pyfits for verifying
+and updating the CHECKSUM and DATASUM keywords of FITS files.
+\fBitscheck\fR can also detect and often fix other FITS standards
+violations. \fBfitscheck\fR facilitates re\-writing the non-standard
+checksums originally generated by pyfits with standard checksums which
+will interoperate with cfitsio.
+.PP
+\fBfitscheck\fR will refuse to write new checksums if the checksum keywords
+are missing or their values are bad. Use \fB\-\-force\fR to write new
+checksums regardless of whether or not they currently exist or pass.
+Use \fB\-\-ignore-missing\fR to tolerate missing checksum keywords without
+comment.
+.SH OPTIONS
+.TP
+\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]
+Choose FITS checksum mode or none. Defaults to standard.
+.TP
+\fB\-w\fR, \fB\-\-write\fR
+Write out file checksums and/or FITS compliance fixes.
+.TP
+\fB\-f\fR, \fB\-\-force\fR
+Do file update even if original checksum was bad.
+.TP
+\fB\-c\fR, \fB\-\-compliance\fR
+Do FITS compliance checking, fix if possible.
+.TP
+\fB\-i\fR, \fB\-\-ignore\-missing\fR
+Ignore missing checksums.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Generate extra output.
+.SH "EXAMPLES"
+.B "% fitscheck --checksum either --write *.fits"
+.br
+Verify and update checksums, tolerating non-standard checksums, updating to standard checksum.
+
+.B "% fitscheck --write --force *.fits"
+.br
+Write new checksums, even if existing checksums are bad or missing.
+
+.B "% fitscheck --compliance *.fits"
+.br
+Verify standard checksums and FITS compliance without changing the files.
+
+.B "% fitscheck --checksum nonstandard *.fits"
+.br
+Verify original nonstandard checksums only.
+
+.B "% fitscheck --checksum none --compliance --write *.fits"
+.br
+Only check and fix compliance problems, ignoring checksums.
+
+.B "% fitscheck *.fits"
+.br
+Verify standard interoperable checksums.
+
+.B "% fitscheck --checksum none --write *.fits"
+.br
+Delete checksum keywords.
+
Modified: packages/pyfits/trunk/debian/patches/01-zlib.diff
===================================================================
--- packages/pyfits/trunk/debian/patches/01-zlib.diff 2012-06-04 19:50:05 UTC (rev 22059)
+++ packages/pyfits/trunk/debian/patches/01-zlib.diff 2012-06-04 22:14:48 UTC (rev 22060)
@@ -1,19 +1,26 @@
---- a/defsetup.py
-+++ b/defsetup.py
-@@ -13,10 +13,9 @@
- ["src/compress.c", "src/fits_hcompress.c",
- "src/fits_hdecompress.c", "src/fitsio.c",
- "src/pliocomp.c", "src/pyfitsCompWrapper.c",
-- "src/quantize.c", "src/ricecomp.c",
-- "src/zlib.c", "src/inffast.c",
-- "src/inftrees.c", "src/trees.c"],
-- include_dirs = ["src", numpy.get_include()])]
-+ "src/quantize.c", "src/ricecomp.c"],
-+ include_dirs = ["src", numpy.get_include()],
-+ libraries = ["z"])]
+---
+ setup.cfg | 5 +----
+ src/compress.c | 2 +-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -43,14 +43,11 @@
+ src/compressionmodule.c
+ src/quantize.c
+ src/ricecomp.c
+- src/zlib.c
+- src/inffast.c
+- src/inftrees.c
+- src/trees.c
+ include_dirs = numpy
+ extra_compile_args =
+ -Wno-unused-function
+ -Wno-strict-prototypes
++libraries = z
- except ImportError:
- ext_modules = ''
+ [build_ext]
+ pre-hook.numpy-extension-hook = stsci.distutils.hooks.numpy_extension_hook
--- a/src/compress.c
+++ b/src/compress.c
@@ -106,7 +106,7 @@
@@ -21,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include "zlib.h"
-+#include <zlib.h>
++#include <zlib.h>
int _pyfits_uncompress2mem_from_mem(
char *inmemptr,
Modified: packages/pyfits/trunk/debian/rules
===================================================================
--- packages/pyfits/trunk/debian/rules 2012-06-04 19:50:05 UTC (rev 22059)
+++ packages/pyfits/trunk/debian/rules 2012-06-04 22:14:48 UTC (rev 22060)
@@ -3,74 +3,91 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-PYVERS:=$(shell pyversions -r)
+# Get flags from dpkg-buildflags
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-include /usr/share/quilt/quilt.make
+PYVERS := $(shell pyversions -r)
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- for py in $(PYVERS); do \
+ for py in $(PYVERS) $(PY3VERS); do \
$$py setup.py clean --all ; \
done
rm -f *.pyc
rm -f lib/svn_version.py
+ rm -rf lib/pyfits.egg-info
rm -f *-stamp
dh_clean
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: $(QUILT_STAMPFN)
dh_testdir
set -e; \
- for py in $(PYVERS); do \
- $$py setup.py build --executable /usr/bin/python ; \
+ for py in $(PYVERS) $(PY3VERS); do \
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ $$py setup.py build ; \
done
touch $@
+# We have nothing to do by default.
+build-indep:
+
install: install-stamp
-install-stamp:
+install-stamp: build-arch
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
+ # Python2 version
set -e; \
for py in $(PYVERS); do \
- $$py setup.py install --prefix=/usr --root=$(CURDIR)/debian/python-pyfits; \
+ $$py setup.py install --prefix=/usr \
+ --root=$(CURDIR)/debian/python-pyfits \
+ --install-layout=deb ; \
+ rm -rf $(CURDIR)/debian/python-pyfits/usr/bin ; \
done
+ # Install fitscheck
+ install -m 755 -d $(CURDIR)/debian/python-pyfits/usr/bin
+ install -m 644 $(CURDIR)/scripts/fitscheck $(CURDIR)/debian/python-pyfits/usr/bin
+ install -m 755 -d $(CURDIR)/debian/python-pyfits/usr/share/man/man1
+ install -m 644 $(CURDIR)/debian/fitscheck.1 $(CURDIR)/debian/python-pyfits/usr/share/man/man1
+
touch $@
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
dh_testdir
dh_testroot
dh_installdocs
dh_installexamples
dh_installchangelogs debian/CHANGES
- dh_pysupport
+ dh_python2
+ dh_numpy
dh_link
dh_strip
dh_compress -X.py
dh_fixperms
- dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-# Nothing to be done here
-binary-arch: build
-
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
More information about the Python-modules-commits
mailing list