[magics] 02/02: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jul 20 10:48:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 5ab920ca6134410d4e94f672f7c27d842d3d4b12
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Jul 17 11:50:15 2015 +0100
refresh patches
---
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/soname-version.patch | 6 +++---
debian/patches/terralib.patch | 10 +++++-----
8 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/debian/patches/cve-2010-3393.patch b/debian/patches/cve-2010-3393.patch
index 7e96143..8fc7dbb 100644
--- a/debian/patches/cve-2010-3393.patch
+++ b/debian/patches/cve-2010-3393.patch
@@ -8,10 +8,10 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aalto at cante.net>
---
-Index: magics++-2.24.4/magics-config.in
+Index: magics++-2.24.7/magics-config.in
===================================================================
---- magics++-2.24.4.orig/magics-config.in
-+++ magics++-2.24.4/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
diff --git a/debian/patches/fix-headers.patch b/debian/patches/fix-headers.patch
index ed7d3b3..f6e66bd 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.4/src/common/SatelliteProjection.h
+Index: magics++-2.24.7/src/common/SatelliteProjection.h
===================================================================
---- magics++-2.24.4.orig/src/common/SatelliteProjection.h
-+++ magics++-2.24.4/src/common/SatelliteProjection.h
+--- magics++-2.24.7.orig/src/common/SatelliteProjection.h
++++ magics++-2.24.7/src/common/SatelliteProjection.h
@@ -34,7 +34,7 @@
#include "Transformation.h"
@@ -16,10 +16,10 @@ Index: magics++-2.24.4/src/common/SatelliteProjection.h
namespace magics {
-Index: magics++-2.24.4/src/common/Transformation.h
+Index: magics++-2.24.7/src/common/Transformation.h
===================================================================
---- magics++-2.24.4.orig/src/common/Transformation.h
-+++ magics++-2.24.4/src/common/Transformation.h
+--- magics++-2.24.7.orig/src/common/Transformation.h
++++ magics++-2.24.7/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 d1396e2..bee17a8 100644
--- a/debian/patches/gcc-4.7.patch
+++ b/debian/patches/gcc-4.7.patch
@@ -4,10 +4,10 @@ Forwarded: no
Last-Updaged: 2015-05-14
Bug-Origin: http://bugs.debian.org/673885.
-Index: magics++-2.24.4/src/visualisers/IsoPlot.cc
+Index: magics++-2.24.7/src/visualisers/IsoPlot.cc
===================================================================
---- magics++-2.24.4.orig/src/visualisers/IsoPlot.cc
-+++ magics++-2.24.4/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()
RangeType def = cell->range();
@@ -79,10 +79,10 @@ Index: magics++-2.24.4/src/visualisers/IsoPlot.cc
if ( legend_only_ ) return;
(*shading_)(data, parent);
// do not send the isolines...
-Index: magics++-2.24.4/src/visualisers/Filter.cc
+Index: magics++-2.24.7/src/visualisers/Filter.cc
===================================================================
---- magics++-2.24.4.orig/src/visualisers/Filter.cc
-+++ magics++-2.24.4/src/visualisers/Filter.cc
+--- magics++-2.24.7.orig/src/visualisers/Filter.cc
++++ magics++-2.24.7/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.4/src/visualisers/Filter.cc
this->back().high(true);
this->back().low(false);
}
-Index: magics++-2.24.4/src/visualisers/Bar.cc
+Index: magics++-2.24.7/src/visualisers/Bar.cc
===================================================================
---- magics++-2.24.4.orig/src/visualisers/Bar.cc
-+++ magics++-2.24.4/src/visualisers/Bar.cc
+--- magics++-2.24.7.orig/src/visualisers/Bar.cc
++++ magics++-2.24.7/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.4/src/visualisers/Bar.cc
map<string, Renderer>::iterator renderer = renderers_.find(lowerCase(bar_style_) );
-Index: magics++-2.24.4/src/decoders/MapGenDecoder.cc
+Index: magics++-2.24.7/src/decoders/MapGenDecoder.cc
===================================================================
---- magics++-2.24.4.orig/src/decoders/MapGenDecoder.cc
-+++ magics++-2.24.4/src/decoders/MapGenDecoder.cc
+--- magics++-2.24.7.orig/src/decoders/MapGenDecoder.cc
++++ magics++-2.24.7/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 58f19b7..3b47b89 100644
--- a/debian/patches/geotiff.patch
+++ b/debian/patches/geotiff.patch
@@ -1,7 +1,7 @@
-Index: magics++-2.24.4/cmake/FindGeoTIFF.cmake
+Index: magics++-2.24.7/cmake/FindGeoTIFF.cmake
===================================================================
---- magics++-2.24.4.orig/cmake/FindGeoTIFF.cmake
-+++ magics++-2.24.4/cmake/FindGeoTIFF.cmake
+--- magics++-2.24.7.orig/cmake/FindGeoTIFF.cmake
++++ magics++-2.24.7/cmake/FindGeoTIFF.cmake
@@ -22,7 +22,7 @@ SET(GEOTIFF_NAMES geotiff)
diff --git a/debian/patches/grib-cmake.patch b/debian/patches/grib-cmake.patch
index 0a51a3b..1593b5a 100644
--- a/debian/patches/grib-cmake.patch
+++ b/debian/patches/grib-cmake.patch
@@ -3,11 +3,11 @@ Description: Disable ecbuild for grib_api, as not shipped with Debian yet.
Last-Updated: 2014-09-12
Forwarded: not-needed
-Index: magics++-2.24.4/CMakeLists.txt
+Index: magics++-2.24.7/CMakeLists.txt
===================================================================
---- magics++-2.24.4.orig/CMakeLists.txt
-+++ magics++-2.24.4/CMakeLists.txt
-@@ -104,9 +104,9 @@ endif()
+--- 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 )
diff --git a/debian/patches/magics-config.patch b/debian/patches/magics-config.patch
index df46fc8..6ff257a 100644
--- a/debian/patches/magics-config.patch
+++ b/debian/patches/magics-config.patch
@@ -4,10 +4,10 @@ Bug-Origin: http://bugs.debian.org/674472
Last-Updated: 2015-05-14
Forwarded: no
-Index: magics++-2.24.4/magics-config.in
+Index: magics++-2.24.7/magics-config.in
===================================================================
---- magics++-2.24.4.orig/magics-config.in
-+++ magics++-2.24.4/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@
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index 1165e73..edde6d7 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -3,10 +3,10 @@ Description: Add versioned soname for Debian.
Forwarded: no
Last-Updated: 2015-06-19
-Index: magics++-2.24.4/src/CMakeLists.txt
+Index: magics++-2.24.7/src/CMakeLists.txt
===================================================================
---- magics++-2.24.4.orig/src/CMakeLists.txt
-+++ magics++-2.24.4/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)
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 9e73daf..15448a2 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -3,10 +3,10 @@ Description: Add Debians libterralib, rather than built-in version
Last-Updated: 2015-06-19
Forwarded: not-needed
-Index: magics++-2.24.4/src/CMakeLists.txt
+Index: magics++-2.24.7/src/CMakeLists.txt
===================================================================
---- magics++-2.24.4.orig/src/CMakeLists.txt
-+++ magics++-2.24.4/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 )
add_subdirectory( visualisers )
add_subdirectory( drivers )
@@ -41,10 +41,10 @@ Index: magics++-2.24.4/src/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/libMagWrapper )
ecbuild_add_library( TARGET MagWrapper
-@@ -239,18 +233,6 @@ if( metview )
+@@ -238,18 +232,6 @@ if( metview )
+ FixedTableModeAttributes.h
)
- install( FILES magics.h DESTINATION ${INSTALL_INCLUDE_DIR})
- install( FILES terralib/kernel/TeProjection.h
- terralib/kernel/TeCoord2D.h
- terralib/kernel/TeDefines.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