[magics] 16/23: Add back 2.22.7 changes
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jun 24 09:33:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository magics.
commit 4e4e74e46f14e668d3cdba1edd46b9a841e1f92f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Jun 18 11:10:14 2015 +0100
Add back 2.22.7 changes
---
debian/changelog | 44 +++++++++++++++++++++-
debian/control | 19 ++++++----
debian/patches/grib-cmake.patch | 22 +++++++++++
debian/patches/qt5.patch | 74 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 3 ++
debian/patches/soname-version.patch | 26 +++++++++++++
debian/patches/terralib.patch | 38 ++++++-------------
7 files changed, 191 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 869e9d9..a24cf77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,52 @@ magics++ (2.24.4-1) UNRELEASED; urgency=medium
* New upstream release.
* Standards-Version: 3.9.6
- * Move to cmake-based build. Update patches
-- Alastair McKinstry <mckinstry at debian.org> Wed, 29 Apr 2015 08:09:32 +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
diff --git a/debian/control b/debian/control
index 1935a68..b520de6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,19 @@ Source: magics++
Section: science
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9) , dh-buildinfo, gfortran, cmake, chrpath,
- libhdf5-serial-dev | libhdf5-dev, libnetcdf-dev,
- libgl1-mesa-dev, libgd2-dev, libemos-dev, libgrib-api-dev, libterralib-dev,
+Build-Depends: debhelper (>= 9) , dh-buildinfo,
+ cmake, libtool, gfortran,
+ libemos-dev , libgrib-api-dev, libterralib-dev,
+ libnetcdf-dev, libgl1-mesa-dev, libgd2-dev,
libjasper-dev, libcairo2-dev, libpango1.0-dev,
- ttf-dejavu-core, libxml-parser-perl,
- python-all-dev, swig, python-numpy, python-instant, python3-all-dev,
- libopenjpeg-dev, ghostscript, zlib1g-dev, libboost-dev, libproj-dev,
+ ttf-dejavu-core, libxml-parser-perl,
+ python-all-dev (>= 2.6.6-3) , swig, python-instant, python-numpy,
+ chrpath, libopenjpeg-dev, ghostscript, zlib1g-dev,
+ libboost-dev, libproj-dev, libtiff-dev,
libqt4-dev
Standards-Version: 3.9.6
Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.4
Package: libmagplus3
Section: libs
@@ -57,7 +58,9 @@ Description: Development files for ECMWF plotting software MAGICS++
Package: magics++
Architecture: any
Multi-Arch: foreign
-Depends: libmagplus3 ( = ${binary:Version} ), ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+Depends: libmagplus3 ( = ${binary:Version} ),
+ ${misc:Depends}, ${shlibs:Depends}, ksh | mksh | pdksh | zsh,
+ ${python:Depends}
Description: Executables for the magics++ library
Magics++ is the latest generation of the ECMWF's Meteorological plotting
software MAGICS. Although completely redesigned in C++, it is intended to be
diff --git a/debian/patches/grib-cmake.patch b/debian/patches/grib-cmake.patch
new file mode 100644
index 0000000..d3a2e96
--- /dev/null
+++ b/debian/patches/grib-cmake.patch
@@ -0,0 +1,22 @@
+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.22.7/CMakeLists.txt
+===================================================================
+--- magics++-2.22.7.orig/CMakeLists.txt
++++ magics++-2.22.7/CMakeLists.txt
+@@ -95,9 +95,9 @@ endif()
+ ### grib
+
+ 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/qt5.patch b/debian/patches/qt5.patch
new file mode 100644
index 0000000..ab0001a
--- /dev/null
+++ b/debian/patches/qt5.patch
@@ -0,0 +1,74 @@
+uthor: Alastair McKinstry <mckinstry at debian.org>
+Description: Port from Qt4 -> Qt5
+Last-Updated: 2014-10-16
+Forwarded: no
+
+Index: magics++-2.22.7.dfsg.1/src/drivers/QtDriver.cc
+===================================================================
+--- magics++-2.22.7.dfsg.1.orig/src/drivers/QtDriver.cc
++++ magics++-2.22.7.dfsg.1/src/drivers/QtDriver.cc
+@@ -1231,12 +1231,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);
+@@ -1322,7 +1322,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.22.7.dfsg.1/CMakeLists.txt
+===================================================================
+--- magics++-2.22.7.dfsg.1.orig/CMakeLists.txt
++++ magics++-2.22.7.dfsg.1/CMakeLists.txt
+@@ -185,7 +185,7 @@ endif()
+ if( ENABLE_METVIEW )
+ set ( metview yes)
+ unset(MAGICS_ONLY)
+- find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml )
++ find_package(Qt5 5.3.1 REQUIRED Core Gui Xml XmlPatterns Widgets X11Extras )
+ if( QT_FOUND )
+ include( ${QT_USE_FILE} )
+ set( MAGICS_QT 1)
+Index: magics++-2.22.7.dfsg.1/src/CMakeLists.txt
+===================================================================
+--- magics++-2.22.7.dfsg.1.orig/src/CMakeLists.txt
++++ magics++-2.22.7.dfsg.1/src/CMakeLists.txt
+@@ -53,7 +53,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()
+
+Index: magics++-2.22.7.dfsg.1/src/drivers/CMakeLists.txt
+===================================================================
+--- magics++-2.22.7.dfsg.1.orig/src/drivers/CMakeLists.txt
++++ magics++-2.22.7.dfsg.1/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/series b/debian/patches/series
index f2016cd..eb8c424 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,6 @@ gcc-4.7.patch
magics-config.patch
fix-headers.patch
geotiff.patch
+soname-version.patch
+qt5.patch
+grib-cmake.patch
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
new file mode 100644
index 0000000..6e25c38
--- /dev/null
+++ b/debian/patches/soname-version.patch
@@ -0,0 +1,26 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Add versioned soname for Debian.
+Forwarded: no
+Last-Updated: 2014-09-13
+
+Index: magics++-2.22.7.dfsg.1/src/CMakeLists.txt
+===================================================================
+--- magics++-2.22.7.dfsg.1.orig/src/CMakeLists.txt
++++ magics++-2.22.7.dfsg.1/src/CMakeLists.txt
+@@ -85,7 +85,6 @@ endif()
+ if( MAGICS_ODB )
+ add_subdirectory( oda )
+ endif()
+-
+ ecbuild_add_library( TARGET MagPlusSingle
+ SOURCES MagicsSingle.cc
+ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/common
+@@ -119,7 +118,7 @@ ecbuild_add_library( TARGET MagPlusSh
+ ${MAGICS_EXTRA_LIBRARIES}
+ TYPE SHARED
+ )
+-SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus")
++SET_TARGET_PROPERTIES(MagPlusShared PROPERTIES OUTPUT_NAME "MagPlus" VERSION 3.0.0 SOVERSION 3)
+ if ( ENABLE_STATIC_LIBRARY )
+ ecbuild_add_library( TARGET MagPlusStatic
+ DEPENDS magics_params
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 0628896..02c8533 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -1,27 +1,13 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Add Debians libterralib, rather than built-in version
-Last-Updated: 2015-05-14
+Last-Updated: 2014-08-25
Forwarded: not-needed
-Index: magics++-2.24.4/CMakeLists.txt
+Index: magics++-2.22.7/src/CMakeLists.txt
===================================================================
---- magics++-2.24.4.orig/CMakeLists.txt
-+++ magics++-2.24.4/CMakeLists.txt
-@@ -262,9 +262,6 @@ set( MAGICS_INCLUDE_DIRS
- ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/MgQ
- ${CMAKE_CURRENT_SOURCE_DIR}/src/eckit_readers
- ${CMAKE_CURRENT_SOURCE_DIR}/src/decoders
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/terralib
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/terralib/kernel
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/terralib/utils
- ${Boost_INCLUDE_DIRS} )
-
- if( MAGICS_ODB )
-Index: magics++-2.24.4/src/CMakeLists.txt
-===================================================================
---- magics++-2.24.4.orig/src/CMakeLists.txt
-+++ magics++-2.24.4/src/CMakeLists.txt
-@@ -97,7 +97,6 @@ add_subdirectory( web )
+--- magics++-2.22.7.orig/src/CMakeLists.txt
++++ magics++-2.22.7/src/CMakeLists.txt
+@@ -75,7 +75,6 @@ add_subdirectory( web )
add_subdirectory( visualisers )
add_subdirectory( drivers )
add_subdirectory( decoders )
@@ -29,7 +15,7 @@ Index: magics++-2.24.4/src/CMakeLists.txt
add_subdirectory( eckit_readers )
if( metview )
-@@ -123,7 +122,6 @@ ecbuild_add_library( TARGET MagPlusSh
+@@ -109,7 +108,6 @@ ecbuild_add_library( TARGET MagPlusSh
${drivers_srcs}
${qt_srcs}
${decoders_srcs}
@@ -37,7 +23,7 @@ Index: magics++-2.24.4/src/CMakeLists.txt
${odb_srcs}
TEMPLATES
${common_templates}
-@@ -165,7 +163,6 @@ ecbuild_add_library( TARGET MagPlusSt
+@@ -134,7 +132,6 @@ ecbuild_add_library( TARGET MagPlusSt
${drivers_srcs}
${qt_srcs}
${decoders_srcs}
@@ -45,17 +31,17 @@ Index: magics++-2.24.4/src/CMakeLists.txt
${odb_srcs}
TEMPLATES
${common_templates}
-@@ -201,9 +198,6 @@ if( metview )
+@@ -168,9 +165,6 @@ if( metview )
${CMAKE_CURRENT_SOURCE_DIR}/visualisers
${CMAKE_CURRENT_SOURCE_DIR}/drivers
${CMAKE_CURRENT_SOURCE_DIR}/decoders
- ${CMAKE_CURRENT_SOURCE_DIR}/terralib
- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/kernel
- ${CMAKE_CURRENT_SOURCE_DIR}/terralib/utils
- ${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
-
- ecbuild_add_library( TARGET MagWrapper
-@@ -239,18 +233,6 @@ if( metview )
+ ${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper
+ LIBS
+ ${MAGICS_EXTRA_LIBRARIES}
+@@ -197,18 +191,6 @@ if( metview )
)
install( FILES magics.h DESTINATION ${INSTALL_INCLUDE_DIR})
--
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