[magics] 03/10: WIP: New upstream release 2.26.2. Merge to debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Jan 10 15:59:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 82f9cb686094598c1dda8d3f87b8eeb85fe86558
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jan 4 05:36:21 2016 +0000
WIP: New upstream release 2.26.2. Merge to debian/master
---
debian/changelog | 16 ++++-
debian/patches/cmake-config.patch | 6 +-
debian/patches/cve-2010-3393.patch | 31 ----------
debian/patches/fix-headers.patch | 12 ++--
debian/patches/gcc-4.7.patch | 30 ++++-----
debian/patches/geotiff.patch | 13 ++--
debian/patches/grib-cmake.patch | 22 -------
debian/patches/magics-config.patch | 117 -----------------------------------
debian/patches/qt5.patch | 116 ----------------------------------
debian/patches/reproducibility.patch | 71 +++++++++++----------
debian/patches/series | 5 --
debian/patches/soname-version.patch | 31 +++++-----
debian/patches/terralib.patch | 20 +++---
13 files changed, 114 insertions(+), 376 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ef09044..b49bc3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
+magics++ (2.26.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Patches merged upstream / obsoleted:
+ magics-config.patch
+ qt5.patch
+ cve-2010-3393.patch
+ grib-cmake.patch
+ * reproducibility: set LC_ALL=C.UTF-8 when sorting in build
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 04 Jan 2016 05:35:27 +0000
+
magics++ (2.24.7-7) unstable; urgency=medium
- * ABI transition needed for libstdc++ v5, to libmagplusv5. Closes: #797981.
+ * ABI transition needed for libstdc++ v5, to libmagplusv5. Closes: #797981.
-- Alastair McKinstry <mckinstry at debian.org> Sun, 06 Sep 2015 08:07:24 +0100
@@ -15,7 +27,7 @@ magics++ (2.24.7-5) unstable; urgency=medium
* Rebuild against libterralib3 for terralib, g++5 transitions.
* Undo the netcdf transition for the moment
- * Move Qt4 -> Qt5
+ * Move Qt4 -> Qt5
-- Alastair McKinstry <mckinstry at debian.org> Fri, 07 Aug 2015 13:28:04 +0100
diff --git a/debian/patches/cmake-config.patch b/debian/patches/cmake-config.patch
index 2b68997..89cbf54 100644
--- a/debian/patches/cmake-config.patch
+++ b/debian/patches/cmake-config.patch
@@ -3,10 +3,10 @@ Description: Ensure /usr/include/magics on include path in Metview
Last-Updated: 2015-07-21
Forwarded: not-needed
-Index: magics++-2.24.7/cmake/project-config.cmake.in
+Index: magics++-2.26.2/cmake/project-config.cmake.in
===================================================================
---- magics++-2.24.7.orig/cmake/project-config.cmake.in
-+++ magics++-2.24.7/cmake/project-config.cmake.in
+--- magics++-2.26.2.orig/cmake/project-config.cmake.in
++++ magics++-2.26.2/cmake/project-config.cmake.in
@@ -17,7 +17,7 @@
get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/debian/patches/cve-2010-3393.patch b/debian/patches/cve-2010-3393.patch
deleted file mode 100644
index 8fc7dbb..0000000
--- a/debian/patches/cve-2010-3393.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4d974cdaf4547520d6ce335f88f5f67712e97766 Mon Sep 17 00:00:00 2001
-From: Jari Aalto <jari.aalto at cante.net>
-Date: Sat, 16 Oct 2010 19:52:12 +0300
-Subject: [PATCH] CVE-2010-3393 insecure library loading Bug#598418
-Organization: Private
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jari Aalto <jari.aalto at cante.net>
----
-Index: magics++-2.24.7/magics-config.in
-===================================================================
---- magics++-2.24.7.orig/magics-config.in
-+++ magics++-2.24.7/magics-config.in
-@@ -76,6 +76,7 @@ if test -h ${prefix}; then
- fi
- fi
-
-+ldlib="${prefix}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
- if test $# -eq 0; then
- usage 1 1>&2
- fi
-@@ -135,7 +136,7 @@ while test $# -gt 0; do
- echo ""
- echo " export MAGPLUS_HOME=${prefix}"
- echo " export PATH=${prefix}/bin:\$PATH"
-- echo " export LD_LIBRARY_PATH=${libdir}:\$LD_LIBRARY_PATH"
-+ echo " export LD_LIBRARY_PATH=\"$ldlib\""
- echo " export PYTHONPATH=\"${py_dir}:\${PYTHONPATH:-/usr/lib}\""
- echo ""
- echo " You might want add these lines to your login scripts (.profile, .kshrc or .bashrc)."
diff --git a/debian/patches/fix-headers.patch b/debian/patches/fix-headers.patch
index f6e66bd..d871885 100644
--- a/debian/patches/fix-headers.patch
+++ b/debian/patches/fix-headers.patch
@@ -3,10 +3,10 @@ Description: Point headers to terralib shipped with Debian, not local version
Last-Updated: 2015-05-14
Forwarded: not-needed
-Index: magics++-2.24.7/src/common/SatelliteProjection.h
+Index: magics++-2.26.2/src/common/SatelliteProjection.h
===================================================================
---- magics++-2.24.7.orig/src/common/SatelliteProjection.h
-+++ magics++-2.24.7/src/common/SatelliteProjection.h
+--- magics++-2.26.2.orig/src/common/SatelliteProjection.h
++++ magics++-2.26.2/src/common/SatelliteProjection.h
@@ -34,7 +34,7 @@
#include "Transformation.h"
@@ -16,10 +16,10 @@ Index: magics++-2.24.7/src/common/SatelliteProjection.h
namespace magics {
-Index: magics++-2.24.7/src/common/Transformation.h
+Index: magics++-2.26.2/src/common/Transformation.h
===================================================================
---- magics++-2.24.7.orig/src/common/Transformation.h
-+++ magics++-2.24.7/src/common/Transformation.h
+--- magics++-2.26.2.orig/src/common/Transformation.h
++++ magics++-2.26.2/src/common/Transformation.h
@@ -62,7 +62,7 @@ Currently Magics++ supports following pr
#include "UserPoint.h"
#include "MagTranslator.h"
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
index bee17a8..00c44b6 100644
--- a/debian/patches/gcc-4.7.patch
+++ b/debian/patches/gcc-4.7.patch
@@ -4,11 +4,11 @@ Forwarded: no
Last-Updaged: 2015-05-14
Bug-Origin: http://bugs.debian.org/673885.
-Index: magics++-2.24.7/src/visualisers/IsoPlot.cc
+Index: magics++-2.26.2/src/visualisers/IsoPlot.cc
===================================================================
---- magics++-2.24.7.orig/src/visualisers/IsoPlot.cc
-+++ magics++-2.24.7/src/visualisers/IsoPlot.cc
-@@ -483,36 +483,36 @@ void CellBox::split()
+--- magics++-2.26.2.orig/src/visualisers/IsoPlot.cc
++++ magics++-2.26.2/src/visualisers/IsoPlot.cc
+@@ -489,36 +489,36 @@ void CellBox::split()
RangeType def = cell->range();
if ( def != multipleRange ) {
@@ -55,7 +55,7 @@ Index: magics++-2.24.7/src/visualisers/IsoPlot.cc
return;
}
}
-@@ -1337,12 +1337,12 @@ void IsoPlot::isoline(MatrixHandler& dat
+@@ -1343,12 +1343,12 @@ void IsoPlot::isoline(MatrixHandler& dat
*/
void IsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
{
@@ -70,7 +70,7 @@ Index: magics++-2.24.7/src/visualisers/IsoPlot.cc
}
#ifdef ISOPLOT_DEBUG
-@@ -1411,7 +1411,7 @@ void IsoPlot::isoline(MatrixHandler& dat
+@@ -1417,7 +1417,7 @@ void IsoPlot::isoline(MatrixHandler& dat
void NoIsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
{
// Create the isolines...
@@ -79,10 +79,10 @@ Index: magics++-2.24.7/src/visualisers/IsoPlot.cc
if ( legend_only_ ) return;
(*shading_)(data, parent);
// do not send the isolines...
-Index: magics++-2.24.7/src/visualisers/Filter.cc
+Index: magics++-2.26.2/src/visualisers/Filter.cc
===================================================================
---- magics++-2.24.7.orig/src/visualisers/Filter.cc
-+++ magics++-2.24.7/src/visualisers/Filter.cc
+--- magics++-2.26.2.orig/src/visualisers/Filter.cc
++++ magics++-2.26.2/src/visualisers/Filter.cc
@@ -202,7 +202,7 @@ bool MinMaxFilter::Process()
{
// MagLog::debug() << "Min " << lin+fcr+1 << " " << col+fcc+1 << " " << val << "\n";
@@ -101,10 +101,10 @@ Index: magics++-2.24.7/src/visualisers/Filter.cc
this->back().high(true);
this->back().low(false);
}
-Index: magics++-2.24.7/src/visualisers/Bar.cc
+Index: magics++-2.26.2/src/visualisers/Bar.cc
===================================================================
---- magics++-2.24.7.orig/src/visualisers/Bar.cc
-+++ magics++-2.24.7/src/visualisers/Bar.cc
+--- magics++-2.26.2.orig/src/visualisers/Bar.cc
++++ magics++-2.26.2/src/visualisers/Bar.cc
@@ -98,13 +98,13 @@ void Bar::operator()(Data& data, BasicGr
vector<string>::iterator annotation = annotation_.begin();
@@ -124,10 +124,10 @@ Index: magics++-2.24.7/src/visualisers/Bar.cc
map<string, Renderer>::iterator renderer = renderers_.find(lowerCase(bar_style_) );
-Index: magics++-2.24.7/src/decoders/MapGenDecoder.cc
+Index: magics++-2.26.2/src/decoders/MapGenDecoder.cc
===================================================================
---- magics++-2.24.7.orig/src/decoders/MapGenDecoder.cc
-+++ magics++-2.24.7/src/decoders/MapGenDecoder.cc
+--- magics++-2.26.2.orig/src/decoders/MapGenDecoder.cc
++++ magics++-2.26.2/src/decoders/MapGenDecoder.cc
@@ -73,11 +73,11 @@ void MapGenDecoder::decode()
continue;
if ( strncmp(line,"# -b", 4) == 0 )
diff --git a/debian/patches/geotiff.patch b/debian/patches/geotiff.patch
index 3b47b89..cca077e 100644
--- a/debian/patches/geotiff.patch
+++ b/debian/patches/geotiff.patch
@@ -1,13 +1,18 @@
-Index: magics++-2.24.7/cmake/FindGeoTIFF.cmake
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix paths needed for geotiff on Debian
+Last-Updated: 2016-01-07
+Forwarded: no
+
+Index: magics++-2.26.2/cmake/FindGeoTIFF.cmake
===================================================================
---- magics++-2.24.7.orig/cmake/FindGeoTIFF.cmake
-+++ magics++-2.24.7/cmake/FindGeoTIFF.cmake
+--- magics++-2.26.2.orig/cmake/FindGeoTIFF.cmake
++++ magics++-2.26.2/cmake/FindGeoTIFF.cmake
@@ -22,7 +22,7 @@ SET(GEOTIFF_NAMES geotiff)
FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h PATH_PREFIXES geotiff
- PATHS /usr/local/include/libgeotiff /usr/include/libgeotiff)
-+ PATHS /usr/local/include/libgeotiff /usr/include/libgeotiff /usr/include/geotiff )
++ PATHS /usr/include/libgeotiff /usr/include/geotiff )
FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES})
diff --git a/debian/patches/grib-cmake.patch b/debian/patches/grib-cmake.patch
deleted file mode 100644
index 1593b5a..0000000
--- a/debian/patches/grib-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Disable ecbuild for grib_api, as not shipped with Debian yet.
-Last-Updated: 2014-09-12
-Forwarded: not-needed
-
-Index: magics++-2.24.7/CMakeLists.txt
-===================================================================
---- magics++-2.24.7.orig/CMakeLists.txt
-+++ magics++-2.24.7/CMakeLists.txt
-@@ -105,9 +105,9 @@ endif()
- #cmake_add_cxx_flags("-gdwarf-2")
-
- set( grib no )
--if( ENABLE_GRIB )
-- ecbuild_use_package( PROJECT grib_api VERSION 1.9 REQUIRED)
--endif()
-+#if( ENABLE_GRIB )
-+# ecbuild_use_package( PROJECT grib_api VERSION 1.9 REQUIRED)
-+#endif()
- if( GRIB_API_FOUND )
- set( MAGICS_GRIB 1 )
- set( grib yes )
diff --git a/debian/patches/magics-config.patch b/debian/patches/magics-config.patch
deleted file mode 100644
index 6ff257a..0000000
--- a/debian/patches/magics-config.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Description: Make magics-config inherit from pkg-config, for Multi-arch support.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Bug-Origin: http://bugs.debian.org/674472
-Last-Updated: 2015-05-14
-Forwarded: no
-
-Index: magics++-2.24.7/magics-config.in
-===================================================================
---- magics++-2.24.7.orig/magics-config.in
-+++ magics++-2.24.7/magics-config.in
-@@ -2,18 +2,22 @@
-
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=`pkg-config --variable=libdir magics`
- includedir=@CMAKE_INSTALL_PREFIX@/include/magics
--F77="@CMAKE_Fortran_COMPILER@"
--CC="@CMAKE_C_COMPILER@"
--CXX="@CMAKE_CXX_COMPILER@"
--CXXFLAGS="@CMAKE_CXX_FLAGS@"
--AXX="@AXX@"
--SHLIB_EXT="@CMAKE_SHARED_LIBRARY_SUFFIX@"
--FFLAGS="@CMAKE_Fortran_FLAGS@"
--CPPLIBS="@CPPLIBS@"
--py_dir="@PYTHON_SITE_PACKAGES@"
- suffix=""
-+F77=`pkg-config --variable=F77 magics`
-+CC=`pkg-config --variable=CC magics`
-+CXX=`pkg-config --variable=CXX magics`
-+CXXFLAGS=`pkg-config --variable=CXXFLAGS magics`
-+AXX=`pkg-config --variable=AXX magics`
-+SHLIB_EXT=`pkg-config --variable=SHLIB_EXT magics`
-+FFLAGS=`pkg-config --variable=FFLAGS magics`
-+CPPLIBS=`pkg-config --variable=CPPLIBS magics`
-+LDFLAGS=`pkg-config --variable=LDFLAGS magics`
-+FLIBS=`pkg-config --variable=FLIBS magics`
-+MAGICS_3RDPARTY_LIBS=`pkg-config --variable=MAGICS_3RDPARTY_LIBS magics`
-+MAGICS_3RDPARTY_INCLUDE=`pkg-config --variable=MAGICS_3RDPARTY_INCLUDE magics`
-+py_dir=`pkg-config --variable=py_dir magics`
-
- #
- # add --print-config
-@@ -210,7 +214,7 @@ while test $# -gt 0; do
- echo ""#"NO DOUBLE FLAG in g77"
- ;;
- # Portland pgf90
-- pgf90 | pgf77 )
-+ gf90 | pgf77 )
- FXX="-tp amd64 ${FXX}"
- ;;
- esac
-@@ -239,7 +243,7 @@ if test "$echo_cxxflags" = "yes"; then
- if test "$includedir" != "/usr/include" ; then
- my_cxxflags="-I${includedir}"
- fi
-- echo "${AXX} ${my_cxxflags} @MAGICS_3RDPARTY_INCLUDE@"
-+ echo "${AXX} ${my_cxxflags} ${MAGICS_3RDPARTY_INCLUDE}"
- fi
-
- if test "$echo_libs" = "yes"; then
-@@ -250,7 +254,7 @@ if test -f ${libdir}/libMagPlus at CMAKE_SH
- fi
-
-
-- my_libs="${my_libs} @MAGICS_EXTRA_LIBS@"
-+ my_libs="${my_libs} ${MAGICS_EXTRA_LIBS}"
-
- if test "$echo_clibs" = "yes"; then
- my_libs="${my_libs} $CPPLIBS"
-@@ -270,7 +274,7 @@ fi
-
- if test "$echo_static" = "yes"; then
- if test -f ${libdir}/libMagPlus.a ; then
-- static="${precision_static} ${libdir}/libMagPlus.a -L${libdir} @LDFLAGS@ @MAGICS_EXTRA_LIBS@ @MAGICS_RPATH@ $CPPLIBS"
-+ static="${precision_static} ${libdir}/libMagPlus.a -L${libdir} ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS"
- precision=${precision_static}
- echo ${static}
- else
-@@ -282,7 +286,7 @@ fi
-
- if test "$echo_shared" = "yes"; then
- if test -f ${libdir}/libMagPlus at CMAKE_SHARED_LIBRARY_SUFFIX@ ; then
-- shared=" ${precision_shared} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_RPATH@ $CPPLIBS"
-+ shared=" ${precision_shared} -L${libdir} -lMagPlus ${LDFLAGS} $CPPLIBS"
- echo ${shared}
- precision=${precision_shared}
- else
-@@ -291,7 +295,7 @@ if test "$echo_shared" = "yes"; then
- fi
-
- if test "$echo_flibs" = "yes"; then
-- echo @FLIBS@
-+ echo ${FLIBS}
- fi
-
- if test "$compile" = "yes"; then
-@@ -304,8 +308,8 @@ if test "$compile" = "yes"; then
- if test ${name} != ${f77_file} ; then
- out="-o $name " ### avoid overriding source file
- fi
-- echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS"
-- $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS
-+ echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS"
-+ $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS
- fi
-
- if test "$compileC" = "yes"; then
-@@ -319,6 +323,6 @@ if test "$compileC" = "yes"; then
- if test ${name} != ${c_file} ; then
- out="-o $name " ### avoid overriding source file
- fi
-- echo "$CC ${out}$c_file ${CFLAGS} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS @FLIBS@"
-- $CC ${out}$c_file ${CFLAGS} -I${includedir} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_EXTRA_LIBS@ $CPPLIBS @FLIBS@
-+ echo "$CC ${out}$c_file ${CFLAGS} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS ${FLIBS}"
-+ $CC ${out}$c_file ${CFLAGS} -I${includedir} -L${libdir} -lMagPlus ${LDFLAGS} ${MAGICS_EXTRA_LIBS} $CPPLIBS ${FLIBS}
- fi
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
deleted file mode 100644
index 668205c..0000000
--- a/debian/patches/qt5.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Changes for Qt4 -> Qt5
-Last-Updated: 2015-07-30
-Forwarded: yes
-
-Index: magics++-2.24.7/src/drivers/QtDriver.cc
-===================================================================
---- magics++-2.24.7.orig/src/drivers/QtDriver.cc
-+++ magics++-2.24.7/src/drivers/QtDriver.cc
-@@ -1238,12 +1238,12 @@ MAGICS_NO_EXPORT void QtDriver::renderTe
- tr.scale(1.,-1.);
- tr.translate(-x,-y);
- item->setTransform(tr);
--
- if(an !=0 && an != 360)
- {
-- item->translate(x,y);
-- item->rotate(an);
-- item->translate(-x,-y);
-+ // item->translate(x,y);
-+ // item->rotate(an);
-+ // item->translate(-x,-y);
-+ item->setTransform(QTransform().translate(x, y).rotate(an).translate(-x, -y));
- }
-
- item->setPos(x0,y0);
-@@ -1329,7 +1329,7 @@ MAGICS_NO_EXPORT void QtDriver::renderTe
- item->setPos(x0,y0);
-
- if(an !=0 && an != 360)
-- item->rotate(an);
-+ item->setRotation(item->rotation() + an);
-
- QTransform tr;
- tr.scale(1.,-1.);
-Index: magics++-2.24.7/CMakeLists.txt
-===================================================================
---- magics++-2.24.7.orig/CMakeLists.txt
-+++ magics++-2.24.7/CMakeLists.txt
-@@ -210,16 +210,6 @@ if( ENABLE_METVIEW_NO_QT )
- unset(MAGICS_ONLY)
- endif()
-
--if( ENABLE_METVIEW )
-- set ( metview yes)
-- unset(MAGICS_ONLY)
-- find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml )
-- if( QT_FOUND )
-- include( ${QT_USE_FILE} )
-- set( MAGICS_QT 1)
-- set( qt yes)
-- endif()
--endif()
-
- ecbuild_declare_project()
-
-@@ -277,6 +267,17 @@ endif()
-
- set( MAGICS_LIBRARIES MagPlus )
-
-+if( ENABLE_METVIEW )
-+ set ( metview yes)
-+ unset(MAGICS_ONLY)
-+ find_package(Qt5Core REQUIRED)
-+ find_package(Qt5Widgets REQUIRED)
-+ find_package(Qt5Xml REQUIRED)
-+ set( QT_FOUND yes )
-+ set( MAGICS_QT 1)
-+ set( qt yes)
-+endif()
-+
- foreach( _tpl ${MAGICS_TPLS} )
- string( TOUPPER ${_tpl} TPL )
- list( APPEND MAGICS_EXTRA_DEFINITIONS ${${TPL}_DEFINITIONS} )
-Index: magics++-2.24.7/src/CMakeLists.txt
-===================================================================
---- magics++-2.24.7.orig/src/CMakeLists.txt
-+++ magics++-2.24.7/src/CMakeLists.txt
-@@ -75,7 +75,7 @@ if ( metview )
-
- if(qt)
- SET(qt_drivers_HEADERS drivers/MgQ/MgQPlotScene.h)
-- QT4_WRAP_CPP(qt_drivers_HEADERS_MOC ${qt_drivers_HEADERS})
-+ QT5_WRAP_CPP(qt_drivers_HEADERS_MOC ${qt_drivers_HEADERS})
- list( APPEND drivers_srcs drivers/MgQ/MgQPlotScene.cc ${qt_drivers_HEADERS_MOC})
- endif()
-
-@@ -146,6 +146,7 @@ SET_TARGET_PROPERTIES(MagPlusShared PROP
- SET_TARGET_PROPERTIES(MagPlusDoubleShared PROPERTIES OUTPUT_NAME "MagPlusDouble" VERSION 3.0.0 SOVERSION 3)
- SET_TARGET_PROPERTIES(MagPlusSingleShared PROPERTIES OUTPUT_NAME "MagPlusSingle" VERSION 3.0.0 SOVERSION 3)
-
-+target_link_libraries(MagPlusShared Qt5::Core Qt5::Widgets Qt5::Xml)
-
-
-
-@@ -212,6 +213,7 @@ if( metview )
- ${MAGICS_EXTRA_LIBRARIES}
- TYPE STATIC
- )
-+ target_link_libraries(MagWrapper Qt5::Core Qt5::Widgets Qt5::Xml Qt5::Gui)
- list( APPEND attributes_include
- OutputHandlerAttributes.h
- FortranRootSceneNodeAttributes.h
-Index: magics++-2.24.7/src/drivers/CMakeLists.txt
-===================================================================
---- magics++-2.24.7.orig/src/drivers/CMakeLists.txt
-+++ magics++-2.24.7/src/drivers/CMakeLists.txt
-@@ -37,7 +37,7 @@ if( MAGICS_QT )
-
-
- set (qt_files_HEADERS MgQ/MgQPlotScene.h)
-- QT4_WRAP_CPP(qt_files_HEADERS_MOC ${qt_files_HEADERS})
-+ QT5_WRAP_CPP(qt_files_HEADERS_MOC ${qt_files_HEADERS})
-
- list( APPEND qt_srcs ${qt_files_HEADERS_MOC})
-
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
index 64495d7..c6013b2 100644
--- a/debian/patches/reproducibility.patch
+++ b/debian/patches/reproducibility.patch
@@ -1,16 +1,17 @@
Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Bit-identntical reproducibility fixes:
+Description: Bit-identical reproducibility fixes:
* Don't put timestamps into header files.
* Don't include random build path in config file.
+ * 2016-01-07: Include LC_ALL=C when sorting
Bugs-Debian: https://bugs.debian.org/792824
-Last-Updated: 2015-07-20
+Last-Updated: 2016-01-07
Forwarded: no
-Index: magics++-2.24.7/tools/xml2cc_new.pl
+Index: magics++-2.26.2/tools/xml2cc_new.pl
===================================================================
---- magics++-2.24.7.orig/tools/xml2cc_new.pl
-+++ magics++-2.24.7/tools/xml2cc_new.pl
-@@ -164,7 +164,6 @@ foreach my $object (keys %{$info->{magic
+--- magics++-2.26.2.orig/tools/xml2cc_new.pl
++++ magics++-2.26.2/tools/xml2cc_new.pl
+@@ -167,7 +167,6 @@ foreach my $object (keys %{$info->{magic
This file is automatically generated.
Do Not Edit!
@@ -18,7 +19,7 @@ Index: magics++-2.24.7/tools/xml2cc_new.pl
*/
-@@ -339,7 +338,6 @@ EOF
+@@ -342,7 +341,6 @@ EOF
This file is automatically generated.
Do Not Edit!
@@ -26,29 +27,23 @@ Index: magics++-2.24.7/tools/xml2cc_new.pl
*/
#include "$object\Attributes.h"
-Index: magics++-2.24.7/cmake/project-config.cmake.in
+Index: magics++-2.26.2/tools/xml2cc.pl
===================================================================
---- magics++-2.24.7.orig/cmake/project-config.cmake.in
-+++ magics++-2.24.7/cmake/project-config.cmake.in
-@@ -59,13 +59,7 @@ endif()
+--- magics++-2.26.2.orig/tools/xml2cc.pl
++++ magics++-2.26.2/tools/xml2cc.pl
+@@ -3,6 +3,11 @@
- if( NOT @PROJECT_NAME at _BINARY_DIR )
+ use XML::Parser;
+ use Time::localtime;
++use POSIX qw(locale_h);
++use locale;
++
++# To ensure sorting is reproducible
++setlocale(LC_ALL, "C.UTF-8");
-- set( IS_BUILD_DIR_EXPORT @_is_build_dir_export@ )
--
-- if( IS_BUILD_DIR_EXPORT )
-- include( "@TOP_PROJECT_TARGETS_FILE@" OPTIONAL )
-- else()
- include( "${@PNAME at _CMAKE_DIR}/@CMAKE_PROJECT_NAME at -targets.cmake" )
-- endif()
-
- endif()
-
-Index: magics++-2.24.7/tools/xml2cc.pl
-===================================================================
---- magics++-2.24.7.orig/tools/xml2cc.pl
-+++ magics++-2.24.7/tools/xml2cc.pl
-@@ -152,7 +152,7 @@ EOF
+ my $file = shift;
+ my $dir = shift;
+@@ -152,7 +157,7 @@ EOF
my $includes = {};
my @impl=split(/\//, $current->{attributes}->{implements});
my @interfaces = (split(/\//, $current->{attributes}->{interface}), @impl);
@@ -57,11 +52,25 @@ Index: magics++-2.24.7/tools/xml2cc.pl
{
print "#include \"$i.h\"\n";
-Index: magics++-2.24.7/tools/xml2mv.pl
+Index: magics++-2.26.2/tools/xml2mv.pl
===================================================================
---- magics++-2.24.7.orig/tools/xml2mv.pl
-+++ magics++-2.24.7/tools/xml2mv.pl
-@@ -180,7 +180,7 @@ my $includes = {};
+--- magics++-2.26.2.orig/tools/xml2mv.pl
++++ magics++-2.26.2/tools/xml2mv.pl
+@@ -3,9 +3,12 @@
+
+ use XML::Parser;
+ use Data::Dumper;
+-
++use POSIX qw(locale_h);
++use locale;
+ use Time::localtime;
+
++setlocale(LC_ALL, 'C.UTF-8');
++
+ my $file = shift;
+ my $dir = shift;
+ my $Author="MagicsTeam";
+@@ -182,7 +185,7 @@ my $includes = {};
$includes->{$to} = "find" unless $basetype{$to} || $to eq 'Colour' ;
}
diff --git a/debian/patches/series b/debian/patches/series
index e90f46e..38c1c3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,6 @@
-cve-2010-3393.patch
terralib.patch
gcc-4.7.patch
-magics-config.patch
fix-headers.patch
geotiff.patch
soname-version.patch
-grib-cmake.patch
reproducibility.patch
-cmake-config.patch
-qt5.patch
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index edde6d7..c81ad69 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -3,20 +3,23 @@ Description: Add versioned soname for Debian.
Forwarded: no
Last-Updated: 2015-06-19
-Index: magics++-2.24.7/src/CMakeLists.txt
+Index: magics++-2.26.2/src/CMakeLists.txt
===================================================================
---- magics++-2.24.7.orig/src/CMakeLists.txt
-+++ magics++-2.24.7/src/CMakeLists.txt
-@@ -142,9 +142,9 @@ ecbuild_add_library(TARGET MagPlusDou
- SOURCES MagicsDouble.cc
- TYPE SHARED)
-
--SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus")
--SET_TARGET_PROPERTIES(MagPlusDoubleShared PROPERTIES OUTPUT_NAME "MagPlusDouble")
--SET_TARGET_PROPERTIES(MagPlusSingleShared PROPERTIES OUTPUT_NAME "MagPlusSingle")
-+SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus" VERSION 3.0.0 SOVERSION 3)
-+SET_TARGET_PROPERTIES(MagPlusDoubleShared PROPERTIES OUTPUT_NAME "MagPlusDouble" VERSION 3.0.0 SOVERSION 3)
-+SET_TARGET_PROPERTIES(MagPlusSingleShared PROPERTIES OUTPUT_NAME "MagPlusSingle" VERSION 3.0.0 SOVERSION 3)
-
+--- magics++-2.26.2.orig/src/CMakeLists.txt
++++ magics++-2.26.2/src/CMakeLists.txt
+@@ -162,6 +162,7 @@ ecbuild_add_library( TARGET MagPlusSt
+ ecbuild_add_library( TARGET MagPlusSingleStatic
+ SOURCES MagicsSingle.cc
++ VERSION 3.0.0
+ LIBS MagPlusStatic
+ TYPE STATIC
+ OUTPUT_NAME MagPlusSingle )
+@@ -169,6 +170,7 @@ ecbuild_add_library( TARGET MagPlus
+ ecbuild_add_library( TARGET MagPlusDoubleStatic
+ SOURCES MagicsDouble.cc
+ LIBS MagPlusStatic
++ VERSION 3.0.0
+ TYPE STATIC
+ OUTPUT_NAME MagPlusDouble )
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 15448a2..d9b9dee 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -3,11 +3,11 @@ Description: Add Debians libterralib, rather than built-in version
Last-Updated: 2015-06-19
Forwarded: not-needed
-Index: magics++-2.24.7/src/CMakeLists.txt
+Index: magics++-2.26.2/src/CMakeLists.txt
===================================================================
---- magics++-2.24.7.orig/src/CMakeLists.txt
-+++ magics++-2.24.7/src/CMakeLists.txt
-@@ -97,7 +97,6 @@ add_subdirectory( web )
+--- magics++-2.26.2.orig/src/CMakeLists.txt
++++ magics++-2.26.2/src/CMakeLists.txt
+@@ -92,7 +92,6 @@ add_subdirectory( web )
add_subdirectory( visualisers )
add_subdirectory( drivers )
add_subdirectory( decoders )
@@ -15,7 +15,7 @@ Index: magics++-2.24.7/src/CMakeLists.txt
add_subdirectory( eckit_readers )
if( metview )
-@@ -123,7 +122,6 @@ ecbuild_add_library( TARGET MagPlusSh
+@@ -118,7 +117,6 @@ ecbuild_add_library( TARGET MagPlus
${drivers_srcs}
${qt_srcs}
${decoders_srcs}
@@ -23,7 +23,7 @@ Index: magics++-2.24.7/src/CMakeLists.txt
${odb_srcs}
TEMPLATES
${common_templates}
-@@ -165,7 +163,6 @@ ecbuild_add_library( TARGET MagPlusSt
+@@ -152,7 +150,6 @@ ecbuild_add_library( TARGET MagPlusSt
${drivers_srcs}
${qt_srcs}
${decoders_srcs}
@@ -31,7 +31,7 @@ Index: magics++-2.24.7/src/CMakeLists.txt
${odb_srcs}
TEMPLATES
${common_templates}
-@@ -201,9 +198,6 @@ if( metview )
+@@ -187,9 +184,6 @@ if( metview )
${CMAKE_CURRENT_SOURCE_DIR}/visualisers
${CMAKE_CURRENT_SOURCE_DIR}/drivers
${CMAKE_CURRENT_SOURCE_DIR}/decoders
@@ -39,9 +39,9 @@ Index: magics++-2.24.7/src/CMakeLists.txt
- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/kernel
- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/utils
${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
-
- ecbuild_add_library( TARGET MagWrapper
-@@ -238,18 +232,6 @@ if( metview )
+
+
+@@ -226,18 +220,6 @@ if( metview )
FixedTableModeAttributes.h
)
--
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