[magics] 10/63: Merge master changes
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 9adc2e910766fc1bda0160726569ec8127a35282
Merge: 9ee3956 dd801e8
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Sep 8 16:54:42 2015 +0100
Merge master changes
CMakeLists.txt | 3 +-
VERSION.cmake | 4 +-
debian/changelog | 63 ++++++
debian/control | 17 +-
debian/libmagics++-dev.install | 5 +-
debian/libmagics++-dev.links.in | 3 +
debian/libmagplus3.install | 2 -
debian/libmagplus3v5.install.in | 1 +
debian/libmagplus3v5.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 | 80 +++----
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, 760 insertions(+), 407 deletions(-)
diff --cc debian/control
index dbc86fc,83b5fc9..f40845e
--- a/debian/control
+++ b/debian/control
@@@ -11,16 -12,13 +12,16 @@@ Build-Depends: debhelper (>= 9) , dh-b
libjasper-dev, libcairo2-dev, libpango1.0-dev,
ttf-dejavu-core, libxml-parser-perl,
python-all-dev, swig, python-numpy, python-instant,
+ python3-all-dev, python3-numpy, python3-instant,
libopenjpeg-dev, ghostscript, zlib1g-dev, libboost-dev, libproj-dev,
- libqt4-dev
+ qt5-default, qtbase5-dev
Standards-Version: 3.9.6
Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
Vcs-Git: git://anonscm.debian.org/debian-science/packages/magics.git
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.4
- Package: libmagplus3
+ Package: libmagplus3v5
Section: libs
Architecture: any
Multi-Arch: same
diff --cc debian/patches/series
index 4bfb111,e90f46e..840fe07
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,8 -3,9 +3,10 @@@ terralib.patc
gcc-4.7.patch
magics-config.patch
fix-headers.patch
+python3.patch
geotiff.patch
soname-version.patch
- # qt5.patch
grib-cmake.patch
+ reproducibility.patch
+ cmake-config.patch
+ qt5.patch
diff --cc debian/rules
index d1e30ed,9d68c15..c442e7b
--- a/debian/rules
+++ b/debian/rules
@@@ -8,15 -7,15 +8,18 @@@ BUILDDIR = $(CURDIR)/debian/buil
CXXFLAGS:= -fPIC $(shell dpkg-buildflags --get CXXFLAGS)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ export QT_SELECT=5
+
++PYVERS:=$(shell pyversions -s)
++PY3VERS:=$(shell py3versions -s)
++
+ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ AUTOGENERATED:= libmagplus3v5.links libmagics++-dev.links libmagplus3v5.install
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
- export QT_SELECT=4
-
- #QI=/usr/include/$(DEB_HOST_MULTIARCH)/qt5
- #QTINCS=-I$(QI) -I$(QI)/QtCore -I$(QI)/QtWidgets -I$(QI)/QtGui -I$(QI)/QtX11Extras -I$(QI)/QtXml -I$(QI)/QtXmlPatterns
%:
- dh $@ --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
+ dh $@ --with python2,python3 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
export extra_flags += \
-DBUILD_SITE=debian \
@@@ -109,27 -93,22 +98,24 @@@ override_dh_auto_test check
# (ulimit -s 8192; export PYTHONPATH=$(shell pwd)/swig ; export MAGPLUS_HOME=$(shell pwd) ; $(MAKE) check )
override_dh_auto_install:
- # call configure to rebuild swig/Makefile with correct python version.
- # LDFLAGS="-fPIC $(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" ;
-- $(MAKE) -C debian/build/python/Magics clean install PYTHON_INCLUDE_DIR=/usr/include/python2.7 \
++ $(MAKE) -C debian/build/python/Magics clean install PYTHON_INCLUDE_DIR=/usr/include/$(PYVERS) \
DESTDIR=$(CURDIR)/debian/python-magics++ \ MAGPLUS_HOME=$(CURDIR)
dh_auto_install
- mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
- cp -a debian/tmp/usr/lib/*.a debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
- cp debian/tmp/usr/lib/libMagPlus.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3.0.0
- # cp tools/mapgen_clip debian/tmp/usr/bin
- find debian -name '*.la' -delete
- find debian -name '_Magics.so.0' -delete # Bogus symlinks
- dh_python2 /usr/lib/$(shell pyversions -r)/site-packages/Magics
- dh_python3 /usr/lib/$(shell py3versions -r)/site-packages/Magics
+ # Move lib stuff
+ mkdir -p debian/tmp/$(LIBDIR)
+ cp -a debian/tmp/usr/lib/*.a debian/tmp/usr/lib/pkgconfig debian/tmp/$(LIBDIR)
+ cp debian/tmp/usr/lib/libMagPlus.so debian/tmp/$(LIBDIR)/libMagPlus.so.3.0.0
+ # Fixup the cmake files.
+ mkdir -p debian/tmp/$(LIBDIR)/cmake/magics
+ cp -a debian/tmp/usr/share/magics/cmake/* debian/tmp/$(LIBDIR)/cmake/magics
+ sed -e 's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' \
+ < debian/tmp/usr/share/magics/cmake/magics-targets-none.cmake \
+ | sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' \
+ > debian/tmp/$(LIBDIR)/cmake/magics/magics-targets-none.cmake
+ rm -r debian/tmp/usr/share/magics/cmake
- dh_python2 /usr/lib/python2.7/site-packages/Magics
++ dh_python2 /usr/lib/$(PYVERS)/site-packages/Magics
++ dh_python3 /usr/lib/$(PY3VERS)/site-packages/Magics
dh_numpy -p python-magics++
- find debian/tmp debian/python-magics++ -name '*.so*' -exec chrpath -d {} \;
+ dh_numpy3 -p python3-magics++
- # remove fonts that are present in dejavu-ttf
- rm -rf debian/libmagics++-data/usr/share/magics/ttf
- find debian -name '*.so*' -exec chrpath -d {} \;
- find debian -name magmlx -exec chrpath -d {} \;
- # Deal with links for Multi-Arch:
- dh_link -p libmagics++-dev /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so
- dh_link -p libmagplus3 /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlus.so.3
- mkdir -p debian/libmagics++-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
- find debian -name '*.la' -delete
++ find debian/tmp debian/python-magics++ debian/python3-magics++ -name '*.so*' -exec chrpath -d {} \;
+ find debian/tmp/usr/bin -type f -exec chrpath -d {} \;
--
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