[magics] 01/02: Merge tag 'upstream/2.24.7' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jul 20 10:48:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 2089e7fc796051e9b9fe047b9db1a54b5047afed
Merge: 8dcc444 feb72fc
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jul 16 08:54:44 2015 +0100
Merge tag 'upstream/2.24.7' into debian/master
CMakeLists.txt | 3 +-
VERSION.cmake | 4 +-
debian/changelog | 6 +
src/CMakeLists.txt | 2 +-
src/basic/Layer.cc | 8 +-
src/common/Transformation.cc | 2 +-
src/decoders/GribDecoder.cc | 174 +++++++++------
src/decoders/GribDecoder.h | 3 +
src/decoders/NetcdfOrcaInterpretor.cc | 339 +++++++++++++++---------------
src/drivers/PostScriptDriver.cc | 112 +++++++++-
src/drivers/PostScriptDriver.h | 2 +-
src/libMagWrapper/MagPlus.cc | 1 -
src/params/Wind.xml | 11 +-
src/visualisers/AxisMethod.cc | 6 +-
src/visualisers/MarkerShadingTechnique.cc | 6 +-
src/visualisers/Wind.cc | 2 +
test/CMakeLists.txt | 9 +
test/Testing/Temporary/CTestCostData.txt | 1 +
test/coast.c | 14 ++
19 files changed, 446 insertions(+), 259 deletions(-)
diff --cc debian/changelog
index eaa7b94,0000000..f369cbc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,361 -1,0 +1,367 @@@
++magics++ (2.24.7-1) unstable; urgency=medium
++
++ * New upstream release
++
++ -- Alastair McKinstry <mckinstry at debian.org> Thu, 16 Jul 2015 08:55:06 +0100
++
+magics++ (2.24.4-2) experimental; urgency=medium
+
+ * Test Build against netcdf 4.4.3 in experimental
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 15 Jul 2015 16:48:32 +0100
+
+magics++ (2.24.4-1) unstable; urgency=medium
+
+ * libMagPlusQt no longer built in upstream
+ * Move to unstable
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 09 Jul 2015 06:50:35 +0100
+
+magics++ (2.24.4-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Standards-Version: 3.9.6
+ * emoslib now builds on mips, so remove exception for its dependency
+ * Add Vcs-Git, pointing to debian-science repo.
+ * Uses libgt for build. Closes: #767747.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 24 Jun 2015 18:34:53 +0100
+
+magics++ (2.22.7.dfsg.1-4) unstable; urgency=medium
+
+ * Build -fPIC for mipsel. Closes: #766832
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 30 Oct 2014 19:17:49 +0000
+
+magics++ (2.22.7.dfsg.1-3) unstable; urgency=medium
+
+ * Ship all header files in /usr/include/magics.
+ * Fix arch-dependent stuff in magics-config, which breaks multiarch.
+ Pull from magics.pc instead. Closes: #732621.
+ * Include HAVE_* definitions in extra flags passed to Cmake so that
+ magics_config matches 2.8.15 version needed for metview.
+ Closes: #765524.
+ * Disable qt5 for the moment.
+ * Enable MAGICS_TIFF. Add libtiff-dev to dependencies.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 15 Oct 2014 12:19:12 +0100
+
+magics++ (2.22.7.dfsg.1-2) unstable; urgency=medium
+
+ * Disable OS Check so we build Hurd, kFreeBSD.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 05 Oct 2014 12:44:43 +0100
+
+magics++ (2.22.7.dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release. Build using cmake not configure.
+ Closes: #677210.
+ * DFSG version as .bin files removed (unnecessary).
+ * Now use xz compression.
+ * grib-api now works on mips, so drop conditional depenency on not using
+ emos/grib-api on mips. Closes: #756591.
+ * Drop unnecessary dependency on python3-all-dev until python3 is supported.
+ Closes: #750599.
+ * Build against Qt5
+ * Add ksh depends for magics++ (magjson script)
+ * Add versioned soname for libmagplus.so.3.0.0
+ * Add drop-gen-dates.patch to drop dates in autogenerated header files;
+ creates false positives in diff-detection scripts. Closes: #731621.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 16 Sep 2014 01:32:56 +0100
+
+magics++ (2.18.15-6) unstable; urgency=medium
+
+ * Add dependency on libterralib-dev to libmagics++-dev. Change references
+ to Terralib headers that ship in Debian rather than local ones (not included).
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 23 Feb 2014 21:02:05 +0000
+
+magics++ (2.18.15-5) unstable; urgency=medium
+
+ * Build-Depend on libq4-dev. No longer use libmotif-dev.
+ Closes: #723526, #732328.
+ * Change libmagics++-metview-dev to section: libdevel,
+ default to science; python-* to python
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 16 Dec 2013 18:39:56 +0000
+
+magics++ (2.18.15-4) unstable; urgency=medium
+
+ * Fix hardening rules: disable PIE as it breaks python shlibs.
+ * Add --enable-metview to support MetView.
+ * Add libmagics++-metview-dev to provide libs needed by MetView only.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 12 Dec 2013 11:57:36 +0000
+
+magics++ (2.18.15-3) unstable; urgency=medium
+
+ * Update Homepage.
+ * Standards-Version: 3.9.5
+ * Set python-magics++ as utils, not python to match overrides
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 08 Dec 2013 07:05:29 +0000
+
+magics++ (2.18.15-2) unstable; urgency=low
+
+ * Don't use emoslib on mips: emoslib needs grib-api, not available there.
+ * Now use --enable-opengl as we have real motif in Debian.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 03 Sep 2013 18:34:14 +0100
+
+magics++ (2.18.15-1) unstable; urgency=low
+
+ * New upstream release.
+ * Transition B-D: libgd2-xpm-dev -> libgd2-dev
+ * Standards-Version: 3.9.4
+ * Depend on debhelper >=9.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 22 May 2013 06:14:19 +0100
+
+magics++ (2.18.7-2) unstable; urgency=low
+
+ * libproj-dev is now a requirement, not optional. Include it.
+ Closes: #695963.
+ * Enable hardening.
+ * Don't ship empty dir /usr/share/magics in -dev package.
+ * -data package is now M-A: foreign to satisfy m-a dependencies.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 18 Dec 2012 11:54:23 +0000
+
+magics++ (2.18.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Now at Standards-Version: 3.9.4
+ * Patch from Michael Terry for Ubuntu to delete bogus symlinks when
+ building.
+ * Remove --with-terralib as no longer understood by configure;
+ MAGPLUS_HOME needs to be set when configure run
+ * python-magics++ now depends on python-simplejson
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 10 Dec 2012 06:22:47 +0000
+
+magics++ (2.14.11-4) unstable; urgency=low
+
+ * Rebuild to fix gcc-4.7 issue. Closes: #646734
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 14 Jun 2012 12:32:31 +0100
+
+magics++ (2.14.11-3) unstable; urgency=low
+
+ * Don't forget libdir. read it from pkg-config too. Closes: #674472.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 08 Jun 2012 13:31:18 +0100
+
+magics++ (2.14.11-2) unstable; urgency=low
+
+ * Make magics-config use pkg-config to retrieve arch-dependent variables,
+ for multi-arch support. Closes: #674472.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 07 Jun 2012 16:13:01 +0100
+
+magics++ (2.14.11-1) unstable; urgency=low
+
+ * Standards-Version: 3.9.3. No changes required.
+ * New upstream release.
+ * Fixes for gcc-4.7. Closes: #673885.
+ * Now need python-instant for numpy.i, which is no longer shipped in the
+ swig/ directory.
+ * Now use xz compression.
+ * Make "./debian rules clean" actually work.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 22 May 2012 17:42:33 +0100
+
+magics++ (2.14.5-2) unstable; urgency=low
+
+ * boostlib > 1.32 needs libboost-dev dependency to build.
+ Closes: #653298.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 01 Jan 2012 13:05:35 +0000
+
+magics++ (2.14.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix typo in homepage description. Closes: #571529.
+ * Fix FTBFS in as-needed patch which no longer applied correctly.
+ Closes: #650453.
+ * Remove patches to Makefile.in, now its autogenerated. Just patch
+ Makefile.am.
+ * Move python-magics++ into Section: python from utils
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 21 Dec 2011 15:03:16 +0000
+
+magics++ (2.12.9-5) unstable; urgency=low
+
+ * Recommends: pkg-config in -dev package.
+ * Rebuild against new libgrib-api-dev.
+ * Change section: for python-magics to utils, to match overrides.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 20 Oct 2011 10:40:35 +0100
+
+magics++ (2.12.9-4) unstable; urgency=low
+
+ * Add "-lz" to the LIBS to ensure its linked in correctly, adding zlib1-dev
+ to the B-D to ensure it is present.
+ * Move libMagPlusSingle.a into /usr/lib/${DEB_HOST_MULTIARCH}/ dir
+ Closes: #642446.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 24 Sep 2011 15:05:00 +0100
+
+magics++ (2.12.9-3) unstable; urgency=low
+
+ * Add as-needed.patch to ltmain.sh to fix -Wl,--as-needed issues
+ * Add LIBS=" -lX11 -lpng12" to configure line to link directly libraries that
+ are needed.
+ * Disable test: layout_test fails on some platforms, but only within the
+ Make check context; debugging in progress, but fix FTBFS for python
+ transition. Details in README-testfailures.txt in debian/
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 13 Sep 2011 13:45:47 +0100
+
+magics++ (2.12.9-2) unstable; urgency=low
+
+ * Allow building against libhdf5-dev, not just libhdf5-serial-dev.
+ * Add DEP-3 tags to patches
+ * Loop over and include support for all supported python versions.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 10 Sep 2011 11:18:22 +0100
+
+magics++ (2.12.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Test: layout_test breaks unless ulimit -s 8192 is set beforehand
+ in the debian/rules. Why?
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 08 Jul 2011 17:16:45 +0100
+
+magics++ (2.12.8.dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Move build system from cdbs to debhelper 7
+ * Move from python-support to dhpython2
+ * Depend on libopenjpeg-dev, for grib-api functionality.
+ * Move to Standards-Version: 3.9.2
+ * Build against libterralib3-dev, was libterralib1-dev.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 18 Jun 2011 17:27:27 +0100
+
+magics++ (2.10.0.dfsg-7) unstable; urgency=low
+
+ * Depend on ${python:Depends}. Closes: #609197.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 11 Jan 2011 21:01:37 +0000
+
+magics++ (2.10.0.dfsg-6) unstable; urgency=low
+
+ * FTBFS with python2.7. Patch from Sameer Morar. Closes: #608788.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 04 Jan 2011 11:25:40 +0000
+
+magics++ (2.10.0.dfsg-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches
+ - (cve-2010-3393--bug598418): Refresh patch. Restore deleted line
+ 'python="@MAGICS_PYTHON@"' and adjust $ldlib.
+ (important, security, reopened; Closes: #598418).
+
+ -- Jari Aalto <jari.aalto at cante.net> Sun, 24 Oct 2010 19:20:57 +0300
+
+magics++ (2.10.0.dfsg-5) unstable; urgency=low
+
+ * CVE-2010-3393: Fix LD_LIBRARY_PATH edit. Closes: #598418.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 29 Sep 2010 12:43:09 +0100
+
+magics++ (2.10.0.dfsg-4) unstable; urgency=low
+
+ * Explicitly add dh_pysupport call to triger update-python-modules in
+ postinst, prerm files. Also, move *.so files in python-magics++.install to
+ /usr/lib/pymodules so that they are found and acted upon. Closes: #592422.
+ * Added python-magics++ to Section: python as recommended by lintian.
+ * Added clean rule to delete symlinks, so double-builds succeed.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 11 Aug 2010 10:07:21 +0100
+
+magics++ (2.10.0.dfsg-3) unstable; urgency=low
+
+ * Build-Depend on python-numpy as well. Closes: #590951.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 30 Jul 2010 17:40:23 +0100
+
+magics++ (2.10.0.dfsg-2) unstable; urgency=low
+
+ * Add python support package python-magics++:
+ * Add build-depends on python-all-dev, swig, python-support
+ * Temporararily disable tests, as python tests have paths trouble.
+ * Remove rpath with chrpath
+ * Standrds-Version: 3.9.1
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 28 Jul 2010 01:02:07 +0100
+
+magics++ (2.10.0.dfsg-1) unstable; urgency=low
+
+ * New Upstream release
+ - DFSG version has terralib and pdfs removed.
+ * Move to Standards-Version: 3.9.0
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 21 Jul 2010 08:19:15 +0100
+
+magics++ (2.8.0.dfsg-5) unstable; urgency=low
+
+ * Typo in homepage URL. Closes: #571529.
+ * Move to Standards-Version: 3.8.4, no changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 26 Feb 2010 11:43:35 +0000
+
+magics++ (2.8.0.dfsg-4) unstable; urgency=low
+
+ * Build-Dep: libxml-parser-perl and python for tests.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 07 Jan 2010 12:46:27 +0000
+
+magics++ (2.8.0.dfsg-3) unstable; urgency=low
+
+ * Add Build-Depends: libtool.
+ * Set MAGPLUS_HOME in debian/rules so that tests run, and add gfortran
+ dependency for fortran tests, Add Build-Dep on ttf-dejavu-core for testing.
+ * Disable printer_test as it requires a data file thats missing.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 06 Jan 2010 21:30:31 +0000
+
+magics++ (2.8.0.dfsg-2) unstable; urgency=low
+
+ * Patch: enable static libs in configure.ac. Closes: #562120.
+ * Add dynamic_linking.patch to link libs to libMagPlus directly rather
+ than just magmlx, and remove libs via --as-needed.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 23 Dec 2009 09:33:38 +0000
+
+magics++ (2.8.0.dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add libjasper dependency for grib-api. Add Closes: #562040.
+ * Added libcairo2-dev, libpango1.0-dev build dependencies now needed.
+ * Removed dependency on quilt ; now source format 3.0, so dpkg handles
+ this.
+ * EpsBufr.patch now in upstream; removed
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 22 Dec 2009 11:26:27 +0000
+
+magics++ (2.6.4~dfsg-1) unstable; urgency=low
+
+ * Initial Debian release. Closes: #522984.
+ * Removed pdfs, making dfsg-free version.
+ * Removed terralib from sources; now use external terralib library, for
+ licensing reasons.
+ * Change version number to ~ before upload, so non-dfsg can go away if
+ PDF sources issue solved.
+ * Move to Standards-Version: 3.8.3
+ * DH_COMPAT is now 7.
+ * Moved shared data to libmagics++-data.
+ * Build against libgrib-api, libemos-dev now in unstable.
+ * libmagics++ depends on ttf-dejavu-* fonts rather than includes them;
+ * Build-depend on libhdf5-serial-dev rather than virtual libhdf5-dev
+ * Removed ttf fonts.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 06 Nov 2009 19:54:22 +0000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list