[magics] 07/10: Remove patches that are superceded by changes in ./rules instead
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 e82e8c173acb7c0c90cb526e68f795b143ab5022
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Jan 9 21:16:58 2016 +0000
Remove patches that are superceded by changes in ./rules instead
---
debian/patches/fix-headers.patch | 31 ---------
debian/patches/gcc-4.7.patch | 144 ---------------------------------------
debian/patches/geotiff.patch | 18 -----
debian/patches/series | 3 -
4 files changed, 196 deletions(-)
diff --git a/debian/patches/fix-headers.patch b/debian/patches/fix-headers.patch
deleted file mode 100644
index d871885..0000000
--- a/debian/patches/fix-headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Point headers to terralib shipped with Debian, not local version
-Last-Updated: 2015-05-14
-Forwarded: not-needed
-
-Index: magics++-2.26.2/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"
- #include "SatelliteProjectionAttributes.h"
--#include "TeProjection.h"
-+#include <terralib/kernel/TeProjection.h>
-
- namespace magics {
-
-Index: magics++-2.26.2/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"
- #include "Factory.h"
--#include "TeProjection.h"
-+#include <terralib/kernel/TeProjection.h>
- #include "BasicGraphicsObject.h"
- #include "SceneVisitor.h"
- #include "CustomisedPoint.h"
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
deleted file mode 100644
index 00c44b6..0000000
--- a/debian/patches/gcc-4.7.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fixes needed for compilation with gcc-4.7
-Forwarded: no
-Last-Updaged: 2015-05-14
-Bug-Origin: http://bugs.debian.org/673885.
-
-Index: magics++-2.26.2/src/visualisers/IsoPlot.cc
-===================================================================
---- 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 ) {
-- push_back(cell);
-+ this->push_back(cell);
- }
- else {
- delete cell;
-- push_back(new CellBox(parent_, row1_, row, column1_, column));
-- push_back(new CellBox(parent_, row+1, row2_, column1_, column));
-+ this->push_back(new CellBox(parent_, row1_, row, column1_, column));
-+ this->push_back(new CellBox(parent_, row+1, row2_, column1_, column));
- }
- cell = new CellBox(parent_, row1_, row2_, column+1, column2_);
- def = cell->range();
-
- if ( def != multipleRange ) {
-- push_back(cell);
-+ this->push_back(cell);
- }
- else {
- delete cell;
-- push_back(new CellBox(parent_, row1_, row, column+1, column2_));
-- push_back(new CellBox(parent_, row+1, row2_, column+1, column2_));
-+ this->push_back(new CellBox(parent_, row1_, row, column+1, column2_));
-+ this->push_back(new CellBox(parent_, row+1, row2_, column+1, column2_));
- }
- return;
- }
-
- if (row2_- row1_ > 0) {
-- push_back(new CellBox(parent_, row1_, row, column1_, column2_));
-- push_back(new CellBox(parent_, row+1, row2_, column1_, column2_));
-+ this->push_back(new CellBox(parent_, row1_, row, column1_, column2_));
-+ this->push_back(new CellBox(parent_, row+1, row2_, column1_, column2_));
- return;
- }
-
- if (column2_- column1_ > 0) {
-- push_back(new CellBox(parent_, row1_, row2_, column1_, column));
-- push_back(new CellBox(parent_, row1_, row2_, column+1, column2_));
-+ this->push_back(new CellBox(parent_, row1_, row2_, column1_, column));
-+ this->push_back(new CellBox(parent_, row1_, row2_, column+1, column2_));
- return;
- }
- }
-@@ -1343,12 +1343,12 @@ void IsoPlot::isoline(MatrixHandler& dat
- */
- void IsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
- {
-- prepare(data);
-+ this->prepare(data);
- if ( legend_only_ ) return;
-
- {
- Timer timer("contouring", "Time spent in contouring");
-- isoline(data, parent);
-+ this->isoline(data, parent);
- }
-
- #ifdef ISOPLOT_DEBUG
-@@ -1417,7 +1417,7 @@ void IsoPlot::isoline(MatrixHandler& dat
- void NoIsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
- {
- // Create the isolines...
-- if ( !prepare(data) ) {
-+ if ( !this->prepare(data) ) {
- if ( legend_only_ ) return;
- (*shading_)(data, parent);
- // do not send the isolines...
-Index: magics++-2.26.2/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";
- lo = lo+1;
-- push_back(UserPoint(this->matrix_.column(lin+fcr, col+fcc),this->matrix_.row(lin+fcr, col+fcc),val));
-+ this->push_back(UserPoint(this->matrix_.column(lin+fcr, col+fcc),this->matrix_.row(lin+fcr, col+fcc),val));
- this->back().low(true);
- this->back().high(false);
- }
-@@ -233,7 +233,7 @@ bool MinMaxFilter::Process()
- {
- // MagLog::debug() << "Max " << lin+fcr+1 << " " << col+fcc+1 << " " << val << "\n";
- hi = hi+1;
-- push_back(UserPoint(this->matrix_.column(lin+fcr, col+fcc),this->matrix_.row(lin+fcr, col+fcc),val));
-+ this->push_back(UserPoint(this->matrix_.column(lin+fcr, col+fcc),this->matrix_.row(lin+fcr, col+fcc),val));
- this->back().high(true);
- this->back().low(false);
- }
-Index: magics++-2.26.2/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();
-
-- for (CustomisedPointsList::const_iterator point = points.begin(); point != points.end(); ++point)
-+ for (CustomisedPointsList::const_iterator pt = points.begin(); pt != points.end(); ++pt)
- {
-
-- x = (**point)["x"];
-- next = ((point+1) != points.end() ) ? (**(point+1))["x"] : x;
-- bottom = (min_value_ == INT_MAX) ? (**point)["y_lower"]: min_value_;
-- top = (**point)["y_upper"];
-+ x = (**pt)["x"];
-+ next = ((pt+1) != points.end() ) ? (**(pt+1))["x"] : x;
-+ bottom = (min_value_ == INT_MAX) ? (**pt)["y_lower"]: min_value_;
-+ top = (**pt)["y_upper"];
-
- map<string, Renderer>::iterator renderer = renderers_.find(lowerCase(bar_style_) );
-
-Index: magics++-2.26.2/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 )
- if ( record_ < 0 ) {
-- if ( this->empty() ) push_back(new PointsList());
-+ if ( this->empty() ) this->push_back(new PointsList());
- this->back()->push_back(new UserPoint(0,0,0, true));
- }
- else
-- push_back(new PointsList());
-+ this->push_back(new PointsList());
- else {
- sscanf(line, "%f %f", &lon, &lat);
- this->back()->push_back(new UserPoint(lon, lat, i++));
diff --git a/debian/patches/geotiff.patch b/debian/patches/geotiff.patch
deleted file mode 100644
index cca077e..0000000
--- a/debian/patches/geotiff.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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.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/include/libgeotiff /usr/include/geotiff )
-
- FIND_LIBRARY(GEOTIFF_LIBRARY NAMES ${GEOTIFF_NAMES})
-
diff --git a/debian/patches/series b/debian/patches/series
index 1b42f1e..1636978 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
terralib.patch
-#gcc-4.7.patch
-#fix-headers.patch
-#geotiff.patch
soname-version.patch
reproducibility.patch
compile-fixes.patch
--
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