[magics] branch master updated (8b739e6 -> 4c7891a)

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Aug 28 11:20:28 UTC 2015


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a change to branch master
in repository magics.

      from  8b739e6   Close #767747 as part of cmake changes
      adds  d7977e9   Move to canonical Vcs-Git name
      adds  79b7975   Upload 2.24.4-1~exp1) experimental
      adds  1308163   Unstable release
      adds  24c02bb   libMagPlusQt no longer built
      adds  8dcc444   Test Build against netcdf 4.4.3 in experimental
      adds  feb72fc   New upstream 2.24.7
      adds  2089e7f   Merge tag 'upstream/2.24.7' into debian/master
      adds  5ab920c   refresh patches
      adds  355db3f   Drop timestamps from headers. Closes: #792824.
      adds  046446a   * Additional reproducibility: drop build paths fron config files * Add libMagPlus{Single,Double}.* back to Magics * Fix cmake so that its multi-arch safe, gives right results for metview
      adds  d79c1c1   Prep for release
      adds  a0458b9   Build against new netcdf (4.4.0). Closes: #793882.
      adds  44c1546   WIP: qt5 changes
      adds  9a8dd32   WIP: refresh patch
      adds  1947d9e   set QT_FOUND if we pass the 3 required clauses
      adds  d21ecda   Specify cmake version
      adds  cdfd100   WIP: Test qt5 patch
      adds  b18fa71   Merged current work
      adds  bfdfd10   fix merged qt5 patch
      adds  a6e1e80   Merge branch 'debian/master' into dev-qt5
      adds  4822eaf   refresh patches
      adds  9c4f62c   Changes qt4 -> qt5
       new  a901c8e   Enable Qt5.
       new  5734437   * Rebuild against libterralib3 for terralib, g++5 transitions. * Undo the netcdf transition for the moment
      adds  8af2106   Enable Qt5.
       new  0df2ea3   Merge  back changes to home branch
       new  2195c4c   Add dependency on libnetcdf-cxx-legacy-dev.
       new  4c7891a   Replace B-D libgd2-dev -> libgd-dev

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt                            |   3 +-
 VERSION.cmake                             |   4 +-
 debian/changelog                          |  61 +++++-
 debian/control                            |  14 +-
 debian/libmagics++-dev.install            |   5 +-
 debian/libmagics++-dev.links.in           |   3 +
 debian/libmagplus3.install                |   2 -
 debian/libmagplus3.install.in             |   1 +
 debian/libmagplus3.links.in               |   3 +
 debian/magics++.install                   |   8 +-
 debian/patches/cmake-config.patch         |  18 ++
 debian/patches/cve-2010-3393.patch        |   6 +-
 debian/patches/fix-headers.patch          |  12 +-
 debian/patches/gcc-4.7.patch              |  24 +--
 debian/patches/geotiff.patch              |   6 +-
 debian/patches/grib-cmake.patch           |   8 +-
 debian/patches/magics-config.patch        |   6 +-
 debian/patches/metview_fixes.patch        |  17 --
 debian/patches/qt5.patch                  |  96 ++++++---
 debian/patches/reproducibility.patch      |  72 +++++++
 debian/patches/series                     |   5 +-
 debian/patches/soname-version.patch       |   6 +-
 debian/patches/terralib.patch             |  10 +-
 debian/rules                              |  72 +++----
 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 ++
 40 files changed, 748 insertions(+), 406 deletions(-)
 create mode 100644 debian/libmagics++-dev.links.in
 delete mode 100644 debian/libmagplus3.install
 create mode 100644 debian/libmagplus3.install.in
 create mode 100644 debian/libmagplus3.links.in
 create mode 100644 debian/patches/cmake-config.patch
 delete mode 100644 debian/patches/metview_fixes.patch
 create mode 100644 debian/patches/reproducibility.patch
 create mode 100644 test/Testing/Temporary/CTestCostData.txt
 create mode 100644 test/coast.c

-- 
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