[python-cpl] 04/04: Adjust for new version. Also build python3 package
Ole Streicher
olebole at moszumanska.debian.org
Wed Apr 22 11:46:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository python-cpl.
commit fb1c4db24dee116598a3f13cd923e565e1e340ef
Author: Ole Streicher <olebole at debian.org>
Date: Wed Apr 22 13:46:15 2015 +0200
Adjust for new version. Also build python3 package
---
debian/changelog | 7 +++++++
debian/control | 29 ++++++++++++++++++++++++++---
debian/docs | 2 +-
debian/download_tests.sh | 14 --------------
debian/patches/muntrace-fix.patch | 15 ---------------
debian/patches/series | 1 -
debian/rules | 19 +++++++++++--------
debian/watch | 5 ++---
8 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3ed3037..78ffae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-cpl (0.7~beta-1) UNRELEASED; urgency=low
+
+ * New upstream version
+ * Build python3 package
+
+ -- Ole Streicher <olebole at debian.org> Wed, 22 Apr 2015 12:49:49 +0200
+
python-cpl (0.6.2-4) unstable; urgency=low
* Change maintainer and VCS to debian-astro
diff --git a/debian/control b/debian/control
index 390effb..5472cd4 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,13 @@ Build-Depends: debhelper (>= 9),
python-all-dev (>= 2.6.6-3~),
python-numpy,
python-pkg-resources,
- python-pyfits
-XS-Python-Version: >= 2.6
+ python-astropy,
+ python3-all-dev,
+ python3-numpy,
+ python3-pkg-resources,
+ python3-astropy
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
Standards-Version: 3.9.6
Homepage: http://packages.python.org/python-cpl/index.html
Vcs-Git: git://anonscm.debian.org/debian-astro/packages/python-cpl.git
@@ -23,7 +28,25 @@ Architecture: any
Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
Suggests: gdb
Description: Control pipeline recipes from the European Southern Observatory
- This module can list, configure and execute CPL-based recipes from Python.
+ This module can list, configure and execute CPL-based recipes from Python3.
+ The input, calibration and output data can be specified as FITS files
+ or as pyfits objects in memory.
+ .
+ The Common Pipeline Library (CPL) comprises a set of ISO-C libraries that
+ provide a comprehensive, efficient and robust software toolkit. It forms a
+ basis for the creation of automated astronomical data-reduction tasks.
+ .
+ One of the features provided by the CPL is the ability to create
+ data-reduction algorithms that run as plugins (dynamic libraries). These are
+ called "recipes" and are one of the main aspects of the CPL data-reduction
+ development environment.
+
+Package: python3-cpl
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Suggests: gdb
+Description: Control pipeline recipes from the ESO (Python3)
+ This module can list, configure and execute CPL-based recipes from Python3.
The input, calibration and output data can be specified as FITS files
or as pyfits objects in memory.
.
diff --git a/debian/docs b/debian/docs
index e845566..a1320b1 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.rst
diff --git a/debian/download_tests.sh b/debian/download_tests.sh
deleted file mode 100755
index c33c643..0000000
--- a/debian/download_tests.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-# called with '--upstream-version' <version> <file>
-# Download the test suite
-
-PACKAGE_NAME=python-cpl
-VERSION=$2
-SUBDIR=test
-UPSTREAM_BASE=https://pypi.python.org/packages/source/p/python-cpl
-UPSTREAM_TAR=${UPSTREAM_BASE}/${PACKAGE_NAME}-${SUBDIR}-${VERSION}.tar.gz
-TARFILENAME=$(dirname $3)/${PACKAGE_NAME}_${VERSION}.orig-${SUBDIR}.tar.gz
-
-wget -q -O ${TARFILENAME} ${UPSTREAM_TAR}
-
-uupdate --no-symlink "$@"
diff --git a/debian/patches/muntrace-fix.patch b/debian/patches/muntrace-fix.patch
deleted file mode 100644
index b1a69c2..0000000
--- a/debian/patches/muntrace-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Don't call muntrace of mtrace is not available.
- This is the case on kfreebsd.
---- a/cpl/CPL_recipe.c
-+++ b/cpl/CPL_recipe.c
-@@ -873,7 +873,9 @@
- self->cpl->memory_dump();
- }
- self->cpl->end();
-+#ifdef HAVE_MTRACE
- muntrace();
-+#endif
- _exit(retval);
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 2e11b26..a410047 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
set-default-plugin-path.patch
disable_crash_tests.patch
-muntrace-fix.patch
diff --git a/debian/rules b/debian/rules
index bd55ecc..b261f49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,27 @@
#!/usr/bin/make -f
+PYTHON2:=$(shell pyversions -vr)
+PYTHON3:=$(shell py3versions -vr)
+
+export PYBUILD_NAME=cpl
+export http_proxy = http://127.0.9.1:9
+
%:
- dh $@ --with python2
+ dh $@ --with python2,python3 --buildsystem=pybuild
build_test_recipe:
(cd test/iiinstrumentp && ./bootstrap && ./configure && make CPPFLAGS="$$CPPFLAGS -D_XOPEN_SOURCE=500")
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test: build_test_recipe
- for PYTHON in $(shell pyversions -r); do \
- $$PYTHON setup.py build_ext -i && \
- MALLOC_CHECK_=0 PYTHONPATH=$$(pwd) $$PYTHON test/TestRecipe.py \
+ for PYTHON in $(PYTHON2) $(PYTHON3); do \
+ python$$PYTHON setup.py build_ext -i && \
+ MALLOC_CHECK_=0 PYTHONPATH=$$(pwd) python$$PYTHON test/TestRecipe.py \
|| exit $$? ; \
done
endif
-override_dh_install:
- dh_install
- find debian -name recipe.py -exec sed s+DEB_HOST_MULTIARCH+$(DEB_HOST_MULTIARCH)+g -i {} \;
-
override_dh_shlibdeps:
dh_shlibdeps
dh_numpy
+ dh_numpy3
diff --git a/debian/watch b/debian/watch
index b3688fd..1307d9c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-# format version number, currently 3; this line is compulsory!
version=3
-http://pypi.python.org/pypi/python-cpl .+/python-cpl-([0-9].*)\.tar\.gz debian debian/download_tests.sh
-
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/python-cpl/python-cpl-([0-9].+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-cpl.git
More information about the debian-science-commits
mailing list