This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository saga.
commit 0a824d3686999019d60c8219f55dd5dc9631163e Author: Bas Couwenberg <[email protected]> Date: Fri Jul 8 19:12:32 2016 +0200 Update patches. Changes: - Rename Use-debian-version-dxflib.patch to reflect content changes - Drop spelling-errors.patch, fixed upstream - Mark Use-debian-version-of-libsvm.patch as Forwarded: not-needed - Rename disable-cluster_isodata.patch to disable-imagery_isocluster.patch, the entire subdirectory is now excluded, not only cluster_isodata.cpp. --- debian/changelog | 6 +++ debian/patches/Use-debian-version-dxflib.patch | 43 ---------------- debian/patches/Use-debian-version-of-libsvm.patch | 1 + ...e-pkg-config-for-Debian-version-of-dxflib.patch | 15 ++++++ debian/patches/disable-cluster_isodata.patch | 27 ---------- debian/patches/disable-imagery_isocluster.patch | 30 +++++++++++ debian/patches/series | 5 +- debian/patches/spelling-errors.patch | 58 ---------------------- 8 files changed, 54 insertions(+), 131 deletions(-) diff --git a/debian/changelog b/debian/changelog index c204680..78a0149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,12 @@ saga (2.3.1+dfsg-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. * Update Files-Excluded for GPL-3+ files moved to other paths. + * Update patches, changes: + - Rename Use-debian-version-dxflib.patch to reflect content changes + - Drop spelling-errors.patch, fixed upstream + - Mark Use-debian-version-of-libsvm.patch as Forwarded: not-needed + - Rename disable-cluster_isodata.patch to disable-imagery_isocluster.patch, + the entire subdirectory is now excluded, not only cluster_isodata.cpp. -- Bas Couwenberg <[email protected]> Fri, 08 Jul 2016 18:48:30 +0200 diff --git a/debian/patches/Use-debian-version-dxflib.patch b/debian/patches/Use-debian-version-dxflib.patch deleted file mode 100644 index 3f6fbba..0000000 --- a/debian/patches/Use-debian-version-dxflib.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Use debian version of dxflib -Author: Johan Van de Wauw <[email protected]> -Forwarded: https://sourceforge.net/p/saga-gis/patches/14/ - ---- a/src/modules/io/io_shapes_dxf/dxf_import.cpp -+++ b/src/modules/io/io_shapes_dxf/dxf_import.cpp -@@ -63,7 +63,11 @@ - //--------------------------------------------------------- - #include "dxf_import.h" - -+#ifdef SYSTEM_DXFLIB -+#include <dxflib/dl_dxf.h> -+#else - #include "./dxflib/dl_dxf.h" -+#endif - - - /////////////////////////////////////////////////////////// ---- a/src/modules/io/io_shapes_dxf/dxf_import.h -+++ b/src/modules/io/io_shapes_dxf/dxf_import.h -@@ -74,7 +74,11 @@ - //--------------------------------------------------------- - #include "MLB_Interface.h" - -+#ifdef SYSTEM_DXFLIB -+#include <dxflib/dl_creationadapter.h> -+#else - #include "./dxflib/dl_creationadapter.h" -+#endif - - - /////////////////////////////////////////////////////////// ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU - AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) - AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) - AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) --AC_CHECK_HEADER([dxflib/dl_dxf.h],[AC_CHECK_LIB(libdxf,DL_ArcData,LIBDXFFOUND=1)]) -+PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1]) - - # Checks for header files. - AC_HEADER_STDC diff --git a/debian/patches/Use-debian-version-of-libsvm.patch b/debian/patches/Use-debian-version-of-libsvm.patch index 47e6dc3..c25c05a 100644 --- a/debian/patches/Use-debian-version-of-libsvm.patch +++ b/debian/patches/Use-debian-version-of-libsvm.patch @@ -1,5 +1,6 @@ Description: Use debian version of libsvm Author: Johan Van de Wauw <[email protected]> +Forwarded: not-needed --- a/src/modules/imagery/imagery_svm/Makefile.am +++ b/src/modules/imagery/imagery_svm/Makefile.am diff --git a/debian/patches/Use-pkg-config-for-Debian-version-of-dxflib.patch b/debian/patches/Use-pkg-config-for-Debian-version-of-dxflib.patch new file mode 100644 index 0000000..56686ea --- /dev/null +++ b/debian/patches/Use-pkg-config-for-Debian-version-of-dxflib.patch @@ -0,0 +1,15 @@ +Description: Use pkg-config for Debian version of dxflib. +Author: Bas Couwenberg <[email protected]> +Forwarded: https://sourceforge.net/p/saga-gis/patches/14/ + +--- a/configure.ac ++++ b/configure.ac +@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU + AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,) + AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) + AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,) +-AC_CHECK_HEADER([dxflib/dl_dxf.h],[AC_CHECK_LIB(libdxf,DL_ArcData,LIBDXFFOUND=1)]) ++PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1]) + + # Checks for header files. + AC_HEADER_STDC diff --git a/debian/patches/disable-cluster_isodata.patch b/debian/patches/disable-cluster_isodata.patch deleted file mode 100644 index b1fda87..0000000 --- a/debian/patches/disable-cluster_isodata.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: Disable use of cluster_isodata. - cluster_isodata.cpp is excluded from repacked - upstream tarballs due to license issues. -Author: Bas Couwenberg <[email protected]> -Forwarded: not-needed - ---- a/src/modules/imagery/imagery_classification/Makefile.am -+++ b/src/modules/imagery/imagery_classification/Makefile.am -@@ -14,7 +14,6 @@ classify_cluster_analysis.cpp\ - classify_isocluster.cpp\ - classify_supervised.cpp\ - classify_supervised_polygons.cpp\ --cluster_isodata.cpp\ - decision_tree.cpp\ - MLB_Interface.cpp\ - change_detection.h\ ---- a/src/modules/imagery/imagery_classification/MLB_Interface.cpp -+++ b/src/modules/imagery/imagery_classification/MLB_Interface.cpp -@@ -120,7 +120,7 @@ CSG_Module * Create_Module(int i) - case 4: return( new CPolygon_Classify_Supervised( true) ); - case 5: return( new CPolygon_Classify_Supervised(false) ); - case 6: return( new CClassification_Quality ); -- case 7: return( new CGrid_Cluster_ISODATA ); -+// case 7: return( new CGrid_Cluster_ISODATA ); - - case 8: return( NULL ); - default: return( MLB_INTERFACE_SKIP_MODULE ); diff --git a/debian/patches/disable-imagery_isocluster.patch b/debian/patches/disable-imagery_isocluster.patch new file mode 100644 index 0000000..8539e8f --- /dev/null +++ b/debian/patches/disable-imagery_isocluster.patch @@ -0,0 +1,30 @@ +Description: Disable use of imagery_isocluster. + Files are excluded from repacked upstream tarballs due to license issues. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/configure.ac ++++ b/configure.ac +@@ -294,7 +294,6 @@ AC_OUTPUT(Makefile \ + src/modules/grid/grid_visualisation/Makefile \ + src/modules/imagery/Makefile \ + src/modules/imagery/imagery_classification/Makefile \ +- src/modules/imagery/imagery_isocluster/Makefile \ + src/modules/imagery/imagery_opencv/Makefile \ + src/modules/imagery/imagery_maxent/Makefile \ + src/modules/imagery/imagery_photogrammetry/Makefile \ +--- a/src/modules/imagery/Makefile.am ++++ b/src/modules/imagery/Makefile.am +@@ -1 +1 @@ +-SUBDIRS = imagery_classification imagery_isocluster imagery_maxent imagery_opencv imagery_photogrammetry imagery_segmentation imagery_svm imagery_tools imagery_vigra ++SUBDIRS = imagery_classification imagery_maxent imagery_opencv imagery_photogrammetry imagery_segmentation imagery_svm imagery_tools imagery_vigra +--- a/src/scripting/python/helpers/saga_cmd_param_interface/tools.py ++++ b/src/scripting/python/helpers/saga_cmd_param_interface/tools.py +@@ -663,7 +663,6 @@ tools = [ + ['io_shapes', 21, 'Import Building Sketches from CityGML'], + ['statistics_grid', 14, 'Categorical Coincidence'], + ['ta_hydrology', 27, 'Maximum Flow Path Length'], +-['imagery_isocluster', 0, 'ISODATA Clustering for Grids'], + ['table_calculus', 16, 'Record Statistics'], + ['table_calculus', 17, 'Record Statistics'] + ] diff --git a/debian/patches/series b/debian/patches/series index da9c2c1..8609d3e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ Use-debian-version-of-libsvm.patch 0001-vigra-hdf5-include.patch -Use-debian-version-dxflib.patch -spelling-errors.patch -disable-cluster_isodata.patch +Use-pkg-config-for-Debian-version-of-dxflib.patch +disable-imagery_isocluster.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index fbc46bc..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,58 +0,0 @@ -Description: Fix spelling errors. - allows to <verb> -> allows <verb>ing -Author: Bas Couwenberg <[email protected]> -Forwarded: https://sourceforge.net/p/saga-gis/patches/13/ - ---- a/src/modules/grid/grid_gridding/nn/nn.h -+++ b/src/modules/grid/grid_gridding/nn/nn.h -@@ -228,7 +228,7 @@ void nnpi_setwmin(nnpi* nn, double wmin) - /** `nnhpi' -- "Natural Neighbours Hashing Point Interpolator" -- is a - ** structure for conducting consequitive Natural Neighbours interpolations - ** from the same set of observation points, designed to take advantage of -- ** repeated interpolations in the same point. It allows to modify Z -+ ** repeated interpolations in the same point. It allows modifying Z - ** coordinate of observed data between interpolations (because this does not - ** affect the interpolant weights). - */ -@@ -279,7 +279,7 @@ void nnhpi_setwmin(nnhpi* nn, double wmi - - /** `nnai' -- "Natural Neighbours Array Interpolator" is a structure for - ** conducting consequitive Natural Neighbours interpolations from the same -- ** set of observation points in the same set of points. It allows to modify Z -+ ** set of observation points in the same set of points. It allows modifying Z - ** coordinate of data between interpolations (because this does not - ** affect the interpolant weights). - * ---- a/src/modules/grid/grid_gridding/nn/nncommon.c -+++ b/src/modules/grid/grid_gridding/nn/nncommon.c -@@ -13,7 +13,7 @@ - * - * Revisions: 15/11/2002 PS: Changed name from "utils.c" - * 28/02/2003 PS: Modified points_read() to do the job without -- * rewinding the file. This allows to read from stdin when -+ * rewinding the file. This allows reading from stdin when - * necessary. - * 09/04/2003 PS: Modified points_read() to read from a - * file specified by name, not by handle. ---- a/src/modules/grid/grid_tools/Grid_Value_NoData.cpp -+++ b/src/modules/grid/grid_tools/Grid_Value_NoData.cpp -@@ -77,7 +77,7 @@ CGrid_Value_NoData::CGrid_Value_NoData(v - Set_Author ("O.Conrad (c) 2016"); - - Set_Description (_TW( -- "This tool allows to change a grid's no-data value or value range " -+ "This tool allows changing a grid's no-data value or value range " - "definition. It does not change the cell values of the grid. " - "Its main purpose is to support this type of operation for tool " - "chains and scripting environments." ---- a/src/modules/io/io_esri_e00/e00compr/e00read.c -+++ b/src/modules/io/io_esri_e00/e00compr/e00read.c -@@ -247,7 +247,7 @@ void E00ReadClose(E00ReadPtr psInfo) - /********************************************************************** - * E00ReadRewind() - * -- * Rewind the E00ReadPtr. Allows to start another read pass on the -+ * Rewind the E00ReadPtr. Allows starting another read pass on the - * input file. - **********************************************************************/ - void E00ReadRewind(E00ReadPtr psInfo) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
