From e904a395b2bbea82860cb6fea890255f0b1d50f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bonnard?= Date: Tue, 27 Nov 2018 15:50:10 +0100 Subject: [PATCH 1/2] Upgrade Build-Depends for casacore-3 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index e081760..ba5e867 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: python Priority: optional Maintainer: Debian Astro Team Uploaders: Gijs Molenaar , Ole Streicher -Build-Depends: casacore-dev (>= 2.3.0), +Build-Depends: casacore-dev (>= 3.3.0), debhelper (>= 9), dh-python, libboost-python-dev, - libcasa-python3-2, + libcasa-python3-3, libcfitsio-dev | libcfitsio3-dev, python-all (>= 2.6.6-3~), python-all-dev, -- GitLab From 55b920d1c507e0f116d61f0f5691e28dd045aac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bonnard?= Date: Tue, 27 Nov 2018 16:07:22 +0100 Subject: [PATCH 2/2] Add upstream patch for casacore 3 migration --- ...8316f4f8be3c6519138fb791b2107790d005.patch | 228 ++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 229 insertions(+) create mode 100644 debian/patches/c9ed8316f4f8be3c6519138fb791b2107790d005.patch diff --git a/debian/patches/c9ed8316f4f8be3c6519138fb791b2107790d005.patch b/debian/patches/c9ed8316f4f8be3c6519138fb791b2107790d005.patch new file mode 100644 index 0000000..1459575 --- /dev/null +++ b/debian/patches/c9ed8316f4f8be3c6519138fb791b2107790d005.patch @@ -0,0 +1,228 @@ +From c9ed8316f4f8be3c6519138fb791b2107790d005 Mon Sep 17 00:00:00 2001 +From: Ger van Diepen +Date: Tue, 26 Jun 2018 12:26:14 +0000 +Subject: [PATCH] Fix issue #17, #135 and #136 + +--- + casacore/quanta/quantity.py | 4 ++-- + casacore/tables/table.py | 5 +++-- + src/fitting.cc | 8 ++++---- + src/functionals.cc | 8 ++++---- + src/images.cc | 16 ++++++++-------- + src/pymeasures.cc | 8 ++++---- + src/quanta.cc | 12 ++++++------ + src/quantamath.cc | 6 +++--- + src/tables.cc | 20 ++++++++++---------- + tests/tConvert.cc | 18 +++++++++--------- + 10 files changed, 53 insertions(+), 52 deletions(-) + +--- a/casacore/quanta/quantity.py ++++ b/casacore/quanta/quantity.py +@@ -21,7 +21,7 @@ + QuantVec.get_value = new_get_value + + +-def to_string(quant, fmt="%0.5f"): ++def to_string(quant, fmt="%0.10g"): + val = quant.get_value() + if hasattr(val, "__len__"): + fmt = "[" + ", ".join([fmt % i for i in val]) + "] %s" +--- a/casacore/tables/table.py ++++ b/casacore/tables/table.py +@@ -1778,7 +1778,8 @@ + import os + # Test if casabrowser can be found. + # On OS-X 'which' always returns 0, so use test on top of it. +- if os.system('test -x `which casabrowser` > /dev/null 2>&1') == 0: ++ # Nothing is written on stdout if not found. ++ if os.system('test `which casabrowser`x != x') == 0: + waitstr1 = "" + waitstr2 = "foreground ..." + if not wait: +@@ -1813,7 +1814,7 @@ + try: + import wxPython + except ImportError: +- six.print_('casabrowser nor wx available') ++ six.print_('casabrowser nor wxPython can be found') + return + from wxPython.wx import wxPySimpleApp + import sys +--- a/src/fitting.cc ++++ b/src/fitting.cc +@@ -37,8 +37,8 @@ + + BOOST_PYTHON_MODULE(_fitting) + { +- casa::python::register_convert_excp(); +- casa::python::register_convert_basicdata(); +- casa::python::register_convert_casa_record(); +- casa::python::fit(); ++ casacore::python::register_convert_excp(); ++ casacore::python::register_convert_basicdata(); ++ casacore::python::register_convert_casa_record(); ++ casacore::python::fit(); + } +--- a/src/functionals.cc ++++ b/src/functionals.cc +@@ -36,9 +36,9 @@ + + BOOST_PYTHON_MODULE(_functionals) + { +- casa::python::register_convert_excp(); +- casa::python::register_convert_basicdata(); +- casa::python::register_convert_casa_record(); ++ casacore::python::register_convert_excp(); ++ casacore::python::register_convert_basicdata(); ++ casacore::python::register_convert_casa_record(); + +- casa::python::functional(); ++ casacore::python::functional(); + } +--- a/src/images.cc ++++ b/src/images.cc +@@ -41,16 +41,16 @@ + BOOST_PYTHON_MODULE(_images) + { + // Register the required pyrap converters. +- casa::python::register_convert_excp(); +- casa::python::register_convert_basicdata(); +- casa::python::register_convert_casa_valueholder(); +- casa::python::register_convert_casa_record(); +- casa::python::register_convert_std_vector(); ++ casacore::python::register_convert_excp(); ++ casacore::python::register_convert_basicdata(); ++ casacore::python::register_convert_casa_valueholder(); ++ casacore::python::register_convert_casa_record(); ++ casacore::python::register_convert_std_vector(); + + // Register the FITS and Miriad image types. +- casa::FITSImage::registerOpenFunction(); +- casa::MIRIADImage::registerOpenFunction(); ++ casacore::FITSImage::registerOpenFunction(); ++ casacore::MIRIADImage::registerOpenFunction(); + + // Make python interface to images. +- casa::python::pyimages(); ++ casacore::python::pyimages(); + } +--- a/src/pymeasures.cc ++++ b/src/pymeasures.cc +@@ -34,9 +34,9 @@ + + BOOST_PYTHON_MODULE(_measures) + { +- casa::python::register_convert_excp(); +- casa::python::register_convert_basicdata(); +- casa::python::register_convert_casa_record(); ++ casacore::python::register_convert_excp(); ++ casacore::python::register_convert_basicdata(); ++ casacore::python::register_convert_casa_record(); + +- casa::python::pymeas(); ++ casacore::python::pymeas(); + } +--- a/src/quanta.cc ++++ b/src/quanta.cc +@@ -35,11 +35,11 @@ + + BOOST_PYTHON_MODULE(_quanta) + { +- casa::python::register_convert_excp(); +- casa::python::register_convert_basicdata(); +- casa::python::register_convert_casa_record(); ++ casacore::python::register_convert_excp(); ++ casacore::python::register_convert_basicdata(); ++ casacore::python::register_convert_casa_record(); + +- casa::python::quantity(); +- casa::python::quantvec(); +- casa::python::quantamath(); ++ casacore::python::quantity(); ++ casacore::python::quantvec(); ++ casacore::python::quantamath(); + } +--- a/src/quantamath.cc ++++ b/src/quantamath.cc +@@ -47,9 +47,9 @@ + }; + static Quantity res[N] = { + Quantity(C::pi,""), Quantity(C::e,""), +- QC::c, QC::G, QC::h, QC::HI, QC::R, QC::NA, QC::e, QC::mp, +- QC::mp_me, QC::mu0, QC::epsilon0, QC::k, QC::F, QC::me, QC::re, QC::a0, +- QC::R0, QC::k2 ++ QC::c(), QC::G(), QC::h(), QC::HI(), QC::R(), QC::NA(), QC::e(), ++ QC::mp(), QC::mp_me(), QC::mu0(), QC::epsilon0(), QC::k(), QC::F(), ++ QC::me(), QC::re(), QC::a0(), QC::R0(), QC::k2() + }; + for (int i=0; i<20;++i) { + d[types[i]] = res[i]; +--- a/src/tables.cc ++++ b/src/tables.cc +@@ -38,17 +38,17 @@ + + BOOST_PYTHON_MODULE(_tables) + { +- casa::python::register_convert_excp(); +- casa::python::register_convert_basicdata(); +- casa::python::register_convert_casa_valueholder(); +- casa::python::register_convert_casa_record(); +- casa::python::register_convert_std_vector(); ++ casacore::python::register_convert_excp(); ++ casacore::python::register_convert_basicdata(); ++ casacore::python::register_convert_casa_valueholder(); ++ casacore::python::register_convert_casa_record(); ++ casacore::python::register_convert_std_vector(); + +- casa::python::pytable(); +- casa::python::pytablerow(); +- casa::python::pytableiter(); +- casa::python::pytableindex(); ++ casacore::python::pytable(); ++ casacore::python::pytablerow(); ++ casacore::python::pytableiter(); ++ casacore::python::pytableindex(); + +- casa::python::pyms(); ++ casacore::python::pyms(); + } + +--- a/tests/tConvert.cc ++++ b/tests/tConvert.cc +@@ -30,13 +30,13 @@ + #include + #include + #include +-#include ++#include + + #include + + using namespace boost::python; + +-namespace casa { namespace pyrap { ++namespace casacore { namespace pyrap { + + template + std::ostream& operator<< (std::ostream& os, const std::vector& vec) +@@ -126,13 +126,13 @@ + BOOST_PYTHON_MODULE(_tConvert) + { + // Register the required converters. +- casa::pyrap::register_convert_excp(); +- casa::pyrap::register_convert_basicdata(); +- casa::pyrap::register_convert_casa_valueholder(); +- casa::pyrap::register_convert_casa_record(); +- casa::pyrap::register_convert_std_vector(); +- casa::pyrap::register_convert_std_vector >(); ++ casacore::pyrap::register_convert_excp(); ++ casacore::pyrap::register_convert_basicdata(); ++ casacore::pyrap::register_convert_casa_valueholder(); ++ casacore::pyrap::register_convert_casa_record(); ++ casacore::pyrap::register_convert_std_vector(); ++ casacore::pyrap::register_convert_std_vector >(); + + // Execute the test. +- casa::pyrap::testConvert(); ++ casacore::pyrap::testConvert(); + } diff --git a/debian/patches/series b/debian/patches/series index 898b074..4605f83 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ Set-default-library-name-for-libboost-python.patch +c9ed8316f4f8be3c6519138fb791b2107790d005.patch -- GitLab