[magics] 08/63: * New upstream release. 2.24.4-1~exp1 * Standards-Version: 3.9.6 * emoslib now builds on mips, so remove exception for its dependency * Move to cmake-based build. Update patches * Add Vcs-Git, pointing to debian-science repo. * Uses libgt for build. Closes: #767747.
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 cc778bb62395e1bd2dc94a59f75b5f449e1c5f91
Merge: 1492643 79b7975
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jul 8 21:49:00 2015 +0100
* New upstream release. 2.24.4-1~exp1
* Standards-Version: 3.9.6
* emoslib now builds on mips, so remove exception for its dependency
* Move to cmake-based build. Update patches
* Add Vcs-Git, pointing to debian-science repo.
* Uses libgt for build. Closes: #767747.
Conflicts:
debian/changelog
debian/rules
debian/changelog | 49 +++++++++++-
debian/control | 10 ++-
debian/libmagics++-dev.install | 7 +-
debian/libmagplus3.install | 4 +-
debian/magics++.install | 2 +-
debian/patches/grib-cmake.patch | 22 ++++++
debian/patches/qt5.patch | 74 ++++++++++++++++++
debian/patches/series | 3 +
debian/patches/soname-version.patch | 22 ++++++
debian/patches/terralib.patch | 16 +---
debian/rules | 146 +++++++++++++++++++++++++-----------
11 files changed, 285 insertions(+), 70 deletions(-)
diff --cc debian/changelog
index ca2937b,efa12eb..f729ca4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,9 -3,53 +3,54 @@@ magics++ (2.24.4-1~exp1) experimental;
* New upstream release.
* Standards-Version: 3.9.6
* emoslib now builds on mips, so remove exception for its dependency
+ * Move to cmake-based build. Update patches
+ * Add Vcs-Git, pointing to debian-science repo.
+ * Uses libgt for build. Closes: #767747.
- -- Alastair McKinstry <mckinstry at debian.org> Wed, 29 Apr 2015 08:09:32 +0100
+ -- 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
diff --cc debian/control
index a7c58a0,d1f9b53..cdc41ce
--- a/debian/control
+++ b/debian/control
@@@ -12,8 -15,8 +15,9 @@@ Build-Depends: debhelper (>= 9) , dh-b
libqt4-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
Section: libs
diff --cc debian/patches/series
index 44dc2d4,2bb594a..4bfb111
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,5 -4,7 +4,8 @@@ terralib.patc
gcc-4.7.patch
magics-config.patch
fix-headers.patch
+python3.patch
geotiff.patch
+ soname-version.patch
+ # qt5.patch
+ grib-cmake.patch
diff --cc debian/rules
index b09e9d5,99643f3..1687533
--- a/debian/rules
+++ b/debian/rules
@@@ -8,26 -8,67 +8,67 @@@ CXXFLAGS:= -fPIC $(shell dpkg-buildflag
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# Uncomment this to turn on verbose mode.
- export DH_VERBOSE=1
+ # export DH_VERBOSE=1
+ export QT_SELECT=4
- CMAKE_ARGS:= \
- -DCMAKE_BUILD_TYPE=Release \
- -DENABLE_METVIEW=ON \
- -DENABLE_CAIRO=ON -DENABLE_GEOTIFF=ON \
- -DENABLE_BUFR=ON \
- -DMAGICS_SITE=debian \
- -DENABLE_PYTHON=ON \
- -DMAGICS_EXTRA_INCLUDE_DIRS=/usr/include/terralib/kernel \
- -DMAGICS_EXTRA_LIBRARIES=terralib
-
- # FIXME: Temporarily disable static libs
- # -DENABLE_STATIC_LIBRARY=ON \
- # CFLAGS += -fPIC
- # LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" LIBS=" -lX11 -lpng12 -lz" \
- # MAGPLUS_HOME=$(shell pwd)
+ #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,python3 --buildsystem=cmake
- dh $@ --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
++ dh $@ --with python2,python3 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
+
+ export extra_flags += \
+ -DBUILD_SITE=debian \
+ -DHAVE_LIBGD=1 \
+ -DHAVE_BOOST=1 \
+ -DHAVE_DLFCN_H=1 \
+ -DHAVE_INTTYPES_H=1 \
+ -DHAVE_LIBEXPAT=1 \
+ -DHAVE_LIBGRIB_API=1 \
+ -DHAVE_LIBPROJ=1 \
+ -DHAVE_LIBPTHREAD=1 \
+ -DHAVE_LIBZ=1 \
+ -DHAVE_MEMORY_H=1 \
+ -DHAVE_STDINT_H=1 \
+ -DHAVE_STDLIB_H=1 \
+ -DHAVE_STRINGS_H=1 \
+ -DHAVE_STRING_H=1 \
+ -DHAVE_SYS_STAT_H=1 \
+ -DHAVE_STS_TYPES_H=1 \
+ -DHAVE_UNISTD_H=1 \
+ -DMAGICS_ALLHEADERS=1 \
+ -DMAGICS_GRIB=1 \
+ -DMAGICS_JSON=1 \
+ -DMAGICS_METVIEW=1 \
+ -DMAGICS_GIF=1 \
+ -DMAGICS_QT=1 \
+ -DMAGICS_GIF_ANIMATED=1 \
+ -DMAGICS_TIFF=1 \
+ -DMAGICS_TTF=1 \
+ -DMAGICS_TTF_PATH="share/magics/ttf/" \
+ -DMAGICS_SITE="debian" \
+ -DMAGICS_PYTHON=1 \
+ -DMAGICS_THREADS=1 \
+ -DDISABLE_OS_CHECK=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DBUILD_DOCUMENTATION=ON \
+ -DENABLE_FORTRAN=ON \
+ -DENABLE_LARGE_FILE_SUPPORT=ON \
+ -DENABLE_PYTHON=ON \
+ -DBUILD_EXAMPLES=ON \
+ -DBUILD_SHARED_LIBS=ON \
+ -DENABLE_TESTS=OFF \
+ -DENABLE_RPATHS=OFF \
+ -DENABLE_CAIRO=ON \
+ -DENABLE_BUFR=ON \
+ -DENABLE_GRIB=ON \
+ -DENABLE_METVIEW=ON \
+ -DENABLE_NETCDF=ON \
+ -DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel $(QTINCS)' \
+ -DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd'
+
+ export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)
override_dh_auto_clean:
find . -type l -exec rm {} \;
@@@ -42,35 -86,47 +87,48 @@@ override_dh_auto_configure
ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf share/fonts/truetype/ttf-dejavu/
# Link terralib
[ -e src/terralib ] || ln -sf /usr/include/terralib src/terralib
- dh_auto_configure -- $(CMAKE_ARGS)
+ dh_auto_configure -- $(extra_flags)
+ # Some files are not autogenerated properly, do it here:
+ ./tools/xml2cc_new.pl ./src/params/GribDecoder.xml > ./src/decoders/GribDecoderAttributes.h
+ ./tools/xml2cc_new.pl ./src/params/GribLoop.xml > ./src/decoders/GribLoopAttributes.h
+ ./tools/xml2cc_new.pl ./src/params/QtDriver.xml > ./src/params/QtDriverAttributes.h
+ ./tools/xml2cc_new.pl ./src/params/GDDriver.xml > ./src/params/GDDriverAttributes.h
+ ./tools/xml2mv.pl ./src/params/DateGribLoopStep.xml > ./src/params/DateGribLoopStepWrapper.h
+ ./tools/xml2mv.pl ./src/params/GribLoopStep.xml > ./src/params/GribLoopStepWrapper.h
+ ./tools/xml2mv.pl ./src/params/GribAddressMode.xml > ./src/params/GribAddressModeWrapper.h
+ ./tools/xml2mv.pl ./src/params/GribAddressRecordMode.xml > ./src/params/GribAddressRecordModeWrapper.h
+ ./tools/xml2mv.pl ./src/params/GribAddressByteMode.xml > ./src/params/GribAddressByteModeWrapper.h
+ cp ./src/params/*.h $(BUILDDIR)/src/params
+ cp ./src/decoders/*Attributes.h $(BUILDDIR)/src/decoders
+ cp ./src/decoders/*Attributes.h $(BUILDDIR)/src/params
+ (cd python/Magics && ln -s $(BUILDDIR)/python/Magics/Magics.i )
-
- # §override_dh_auto_test check:
- #echo "Tests disabled; see README-testfailures.txt for details"
+ override_dh_auto_test check:
+ echo "Tests disabled; see README-testfailures.txt for details"
# (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 \
+ DESTDIR=$(CURDIR)/debian/python-magics++ \ MAGPLUS_HOME=$(CURDIR)
dh_auto_install
- # $(MAKE) -C tools prefix=$(shell pwd)/debian/tmp/usr install
- cp tools/mapgen_clip debian/tmp/usr/bin
- # Hack. dh_python2 doesn't know multarch yet.
- mv debian/python-magics++/usr/lib/${DEB_HOST_MULTIARCH}/p* debian/python-magics++/usr/lib
- rmdir debian/python-magics++/usr/lib/${DEB_HOST_MULTIARCH}
- dh_python2
- for pyvers in $(shell pyversions -r) ; do \
- dh_python2 /usr/lib/$$pyvers/site-packages/Magics ; \
- done
- for pyvers in $(shell py3versions -r) ; do \
- dh_python3 /usr/lib/$$pyvers/site-packages/Magics ; \
- done
+ 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
- dh_python2 /usr/lib/python2.7/site-packages/Magics
++ dh_python2 /usr/lib/$(shell pyversions -r)/site-packages/Magics
++ dh_python3 /usr/lib/$(shell py3versions -r)/site-packages/Magics
dh_numpy -p python-magics++
+ 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 '*.so*' -exec chrpath -d {} \;
+ find debian -name magmlx -exec chrpath -d {} \;
# Deal with links for Multi-Arch:
- dh_link -p libmagics++-metview-dev /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so.3.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so
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)/libMagPlusQt.so.3.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libMagPlusQt.so.3
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
--
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