[Git][debian-gis-team/saga][master] Remove old unused patches
Johan Van de Wauw
gitlab at salsa.debian.org
Sat Jul 13 12:15:07 BST 2019
Johan Van de Wauw pushed to branch master at Debian GIS Project / saga
Commits:
1cd33bf3 by Johan Van de Wauw at 2019-07-12T20:13:42Z
Remove old unused patches
- - - - -
9 changed files:
- − debian/patches/0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
- − debian/patches/0001-update-AppStream-metadata-to-conform-with-specificat.patch
- − debian/patches/0001-vigra-hdf5-include.patch
- − debian/patches/0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
- − debian/patches/Fix_projections_gcc6.patch
- − debian/patches/Use-pkg-config-for-Debian-version-of-dxflib.patch
- − debian/patches/fixwikilink.patch
- − debian/patches/spelling-errors.patch
- − debian/patches/spelling-errors2.patch
Changes:
=====================================
debian/patches/0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch deleted
=====================================
@@ -1,114 +0,0 @@
-Description: further fixes to AppStream metadata, refers to [bugs:#264]
-Author: Volker Wichmann <wichmann at laserdata.at>
-Origin: https://sourceforge.net/p/saga-gis/code/ci/3fb9cbbd03c15d90f41d8b800a839649c5d36871/
-Bug: https://sourceforge.net/p/saga-gis/bugs/264/
-
---- a/src/saga_core/saga_gui/Makefile.am
-+++ b/src/saga_core/saga_gui/Makefile.am
-@@ -234,7 +234,7 @@ install-icons:
- $(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
-
- appdatadir = $(datadir)/metainfo
--dist_appdata_DATA = res/org.saga-gis.saga-gui.metainfo.xml
-+dist_appdata_DATA = res/org.saga-gis.saga-gui.appdata.xml
-
- dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
-
---- a/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.metainfo.xml
-+++ /dev/null
-@@ -1,47 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<component>
-- <id type="desktop.application">org.saga_gis.saga.desktop</id>
-- <metadata_license>CC0-1.0</metadata_license>
-- <name>SAGA</name>
-- <summary>System for Automated Geoscientific Analyses</summary>
-- <icon type="remote" width="192" height="192">https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/src/saga_core/saga_gui/res/saga_icon_192.png</icon>
-- <description>
-- <p>
-- SAGA is a Geographic Information System (GIS) software with
-- immense capabilities for geodata processing and analysis.
-- Due to the modular organization of the geoprocessing tools, they can
-- be accessed either through the graphical user interface or
-- via the command line application.
-- </p>
-- <p>
-- Furthermore, SAGA provides an effective Application Programming Interface
-- (API) which makes it easy to implement new tools and functionality.
-- </p>
-- </description>
-- <categories>
-- <category>Education</category>
-- <category>Science</category>
-- <category>Geoscience</category>
-- </categories>
-- <url type="homepage">http://www.saga-gis.org</url>
-- <url type="bugtracker">https://sourceforge.net/p/saga-gis/bugs/</url>
-- <url type="help">http://www.saga-gis.org/saga_tool_doc/index.html</url>
-- <launchable type="desktop-id">org.saga_gis.saga.desktop</launchable>
-- <releases>
-- <release version="6.5.0">
-- </releases>
-- <provides>
-- <binary>saga_gui</binary>
-- <binary>saga_cmd</binary>
-- </provides>
-- <project_license>GPL-2.0-or-later and LGPL-2.1-or-later</project_license>
-- <developer_name>SAGA Development Team</developer_name>
-- <screenshots>
-- <screenshot type="default">
-- <caption>The FooBar main window.</caption>
-- <image type="source" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</image>
-- </screenshot>
-- </screenshots>
-- <updatecontact>https://sourceforge.net/p/saga-gis/feature-requests/</updatecontact>
--</component>
--
---- /dev/null
-+++ b/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
-@@ -0,0 +1,45 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Copyright 2018 SAGA Development Team -->
-+<component type="desktop">
-+ <id type="desktop.application">org.saga_gis.saga.desktop</id>
-+ <metadata_license>CC0-1.0</metadata_license>
-+ <name>SAGA</name>
-+ <summary>System for Automated Geoscientific Analyses</summary>
-+ <icon type="remote" width="192" height="192">https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/src/saga_core/saga_gui/res/saga_icon_192.png</icon>
-+ <description>
-+ <p>
-+ SAGA is a Geographic Information System (GIS) software with
-+ immense capabilities for geodata processing and analysis.
-+ Due to the modular organization of the geoprocessing tools, they can
-+ be accessed either through the graphical user interface or
-+ via the command line application.
-+ </p>
-+ <p>
-+ Furthermore, SAGA provides an effective Application Programming Interface
-+ (API) which makes it easy to implement new tools and functionality.
-+ </p>
-+ </description>
-+ <categories>
-+ <category>Education</category>
-+ <category>Science</category>
-+ <category>Geoscience</category>
-+ </categories>
-+ <url type="homepage">http://www.saga-gis.org</url>
-+ <url type="bugtracker">https://sourceforge.net/p/saga-gis/bugs/</url>
-+ <url type="help">http://www.saga-gis.org/saga_tool_doc/index.html</url>
-+ <launchable type="desktop-id">org.saga_gis.saga.desktop</launchable>
-+ <provides>
-+ <binary>saga_gui</binary>
-+ <binary>saga_cmd</binary>
-+ </provides>
-+ <project_license>GPL-2.0-or-later and LGPL-2.1-or-later</project_license>
-+ <developer_name>SAGA Development Team</developer_name>
-+ <screenshots>
-+ <screenshot type="default">
-+ <caption>The SAGA GUI main window</caption>
-+ <image type="source" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</image>
-+ </screenshot>
-+ </screenshots>
-+ <update_contact>https://sourceforge.net/p/saga-gis/feature-requests/</update_contact>
-+</component>
-+
=====================================
debian/patches/0001-update-AppStream-metadata-to-conform-with-specificat.patch deleted
=====================================
@@ -1,108 +0,0 @@
-Description: update AppStream metadata to conform with specification 0.12
- refers to [bugs:#264] Legacy AppStream metadata format
-Author: Volker Wichmann <wichmann at laserdata.at>
-Origin: https://sourceforge.net/p/saga-gis/code/ci/42dbd92e0f45a44ae5a55e79da523061691bdab0/
-
---- a/src/saga_core/saga_gui/Makefile.am
-+++ b/src/saga_core/saga_gui/Makefile.am
-@@ -233,8 +233,8 @@ install-icons:
- mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps; \
- $(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
-
--appdatadir = $(datadir)/appdata
--dist_appdata_DATA = res/saga.appdata.xml
-+appdatadir = $(datadir)/metainfo
-+dist_appdata_DATA = res/org.saga-gis.saga-gui.metainfo.xml
-
- dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
-
---- /dev/null
-+++ b/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.metainfo.xml
-@@ -0,0 +1,47 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<component>
-+ <id type="desktop.application">org.saga_gis.saga.desktop</id>
-+ <metadata_license>CC0-1.0</metadata_license>
-+ <name>SAGA</name>
-+ <summary>System for Automated Geoscientific Analyses</summary>
-+ <icon type="remote" width="192" height="192">https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/src/saga_core/saga_gui/res/saga_icon_192.png</icon>
-+ <description>
-+ <p>
-+ SAGA is a Geographic Information System (GIS) software with
-+ immense capabilities for geodata processing and analysis.
-+ Due to the modular organization of the geoprocessing tools, they can
-+ be accessed either through the graphical user interface or
-+ via the command line application.
-+ </p>
-+ <p>
-+ Furthermore, SAGA provides an effective Application Programming Interface
-+ (API) which makes it easy to implement new tools and functionality.
-+ </p>
-+ </description>
-+ <categories>
-+ <category>Education</category>
-+ <category>Science</category>
-+ <category>Geoscience</category>
-+ </categories>
-+ <url type="homepage">http://www.saga-gis.org</url>
-+ <url type="bugtracker">https://sourceforge.net/p/saga-gis/bugs/</url>
-+ <url type="help">http://www.saga-gis.org/saga_tool_doc/index.html</url>
-+ <launchable type="desktop-id">org.saga_gis.saga.desktop</launchable>
-+ <releases>
-+ <release version="6.5.0">
-+ </releases>
-+ <provides>
-+ <binary>saga_gui</binary>
-+ <binary>saga_cmd</binary>
-+ </provides>
-+ <project_license>GPL-2.0-or-later and LGPL-2.1-or-later</project_license>
-+ <developer_name>SAGA Development Team</developer_name>
-+ <screenshots>
-+ <screenshot type="default">
-+ <caption>The FooBar main window.</caption>
-+ <image type="source" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</image>
-+ </screenshot>
-+ </screenshots>
-+ <updatecontact>https://sourceforge.net/p/saga-gis/feature-requests/</updatecontact>
-+</component>
-+
---- a/src/saga_core/saga_gui/res/saga.appdata.xml
-+++ /dev/null
-@@ -1,27 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!-- Copyright 2014 SAGA Development Team -->
--<application>
-- <id type="desktop">saga.desktop</id>
-- <metadata_license>CC0-1.0</metadata_license>
-- <project_license>GPL-2.0 and LGPL-2.1</project_license>
-- <name>SAGA</name>
-- <summary>System for Automated Geoscientific Analyses</summary>
-- <description>
-- <p>
-- SAGA is a Geographic Information System (GIS) software with
-- immense capabilities for geodata processing and analysis.
-- Due to the modular organization of the geoprocessing tools, they can
-- be accessed either through the graphical user interface or
-- via the command line application.
-- </p>
-- <p>
-- Furthermore, SAGA provides an effective Application Programming Interface
-- which makes it easy to implement new tools and functionality.
-- </p>
-- </description>
-- <screenshots>
-- <screenshot type="default" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</screenshot>
-- </screenshots>
-- <url type="homepage">http://www.saga-gis.org</url>
-- <updatecontact>http://sourceforge.net/p/saga-gis/feature-requests/?source=navbar</updatecontact>
--</application>
---- a/src/saga_core/saga_gui/res/saga.desktop
-+++ b/src/saga_core/saga_gui/res/saga.desktop
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Name=SAGA GIS
--GenericName=A System for Automated Geoscientific Analyses
-+GenericName=System for Automated Geoscientific Analyses
- Comment=Geodata Processing and Analysis
- Type=Application
- Exec=saga_gui
=====================================
debian/patches/0001-vigra-hdf5-include.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Add hdf5 include path to configure
-Author: Johan Van de Wauw <johan at vandewauw.be>
-Forwarded: not-needed
-
---- a/src/modules/imagery/imagery_vigra/Makefile.am
-+++ b/src/modules/imagery/imagery_vigra/Makefile.am
-@@ -7,7 +7,7 @@ endif
-
- if HAVE_VIGRA
- DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
--CXX_INCS = -I$(top_srcdir)/src/saga_core
-+CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/hdf5/serial
- AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
- AM_LDFLAGS = -fPIC -shared -avoid-version -lvigraimpex -lfftw3
- pkglib_LTLIBRARIES = libimagery_vigra.la
=====================================
debian/patches/0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: further fixes to AppStream metadata, refers to [bugs:#264]
-Author: Volker Wichmann <wichmann at laserdata.at>
-Origin: https://sourceforge.net/p/saga-gis/code/ci/de7f1d450af2ac5a078466499297a8efb5165104/
-Bug: https://sourceforge.net/p/saga-gis/bugs/264/
-
---- a/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
-+++ b/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2018 SAGA Development Team -->
- <component type="desktop">
-- <id type="desktop.application">org.saga_gis.saga.desktop</id>
-+ <id>org.saga_gis.saga.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <name>SAGA</name>
- <summary>System for Automated Geoscientific Analyses</summary>
=====================================
debian/patches/Fix_projections_gcc6.patch deleted
=====================================
@@ -1,135 +0,0 @@
-From f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3 Mon Sep 17 00:00:00 2001
-Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3/
-From: oconrad <conrad at geowiss.uni-hamburg.de>
-Date: Thu, 18 Aug 2016 13:01:36 +0200
-Subject: saga_api, CSG_MetaData, gcc v6 compatibility: is_valid() function
- removed (you can use () operator to check if a child entry with given name
- exists)
-
-
-diff --git a/saga-gis/src/saga_core/saga_api/metadata.cpp b/saga-gis/src/saga_core/saga_api/metadata.cpp
-index 030be0c..4e2f135 100644
---- a/src/saga_core/saga_api/metadata.cpp
-+++ b/src/saga_core/saga_api/metadata.cpp
-@@ -174,17 +174,6 @@ void CSG_MetaData::Destroy(void)
- ///////////////////////////////////////////////////////////
-
- //---------------------------------------------------------
--bool CSG_MetaData::is_Valid(void) const
--{
-- return( this != NULL );
--}
--
--
--///////////////////////////////////////////////////////////
--// //
--///////////////////////////////////////////////////////////
--
--//---------------------------------------------------------
- CSG_MetaData * CSG_MetaData::Add_Child(void)
- {
- return( Ins_Child(-1) );
-diff --git a/saga-gis/src/saga_core/saga_api/metadata.h b/saga-gis/src/saga_core/saga_api/metadata.h
-index 905a668..858be49 100644
---- a/src/saga_core/saga_api/metadata.h
-+++ b/src/saga_core/saga_api/metadata.h
-@@ -157,8 +157,6 @@ public:
- const CSG_MetaData & operator [] (int Index) const { return( *Get_Child(Index ) ); }
- const CSG_MetaData & operator [] (const CSG_String &Name) const { return( *Get_Child(_Get_Child(Name)) ); }
-
-- bool is_Valid (void) const;
--
- int Get_Property_Count (void) const { return( m_Prop_Names.Get_Count() ); }
- const CSG_String & Get_Property_Name (int i) const { return( m_Prop_Names [i] ); }
- const SG_Char * Get_Property (int i) const { return( i >= 0 && i < m_Prop_Values.Get_Count() ? m_Prop_Values[i].c_str() : NULL ); }
-diff --git a/saga-gis/src/saga_core/saga_api/projections.cpp b/saga-gis/src/saga_core/saga_api/projections.cpp
-index d84d386..638c0da 100644
---- a/src/saga_core/saga_api/projections.cpp
-+++ b/src/saga_core/saga_api/projections.cpp
-@@ -220,7 +220,7 @@ double SG_Get_Projection_Unit_To_Meter (TSG_Projection_Unit Unit)
- //---------------------------------------------------------
- bool SG_Set_Projection_Unit (const CSG_MetaData &m, TSG_Projection_Unit &Unit, CSG_String &Name, double &To_Meter)
- {
-- if( m["UNIT"].is_Valid() )
-+ if( m("UNIT") )
- {
- if( m["UNIT"].Get_Property("name", Name) && (Unit = SG_Get_Projection_Unit(Name)) != SG_PROJ_UNIT_Undefined )
- {
-@@ -1042,8 +1042,8 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- // ]
- if( !m.Get_Name().Cmp("GEOGCS") )
- {
-- if( !m["DATUM"].is_Valid()
-- || !m["DATUM"]["SPHEROID"].is_Valid()
-+ if( !m("DATUM")
-+ || !m["DATUM"]("SPHEROID")
- || m["DATUM"]["SPHEROID"].Get_Children_Count() != 2
- || !m["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
- || !m["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d < 0.0 )
-@@ -1056,7 +1056,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- Proj4 += CSG_String::Format(SG_T(" +a=%f"), a); // Semimajor radius of the ellipsoid axis
- Proj4 += CSG_String::Format(SG_T(" +b=%f"), d > 0.0 ? a - a / d : a); // Semiminor radius of the ellipsoid axis
-
-- if( m["DATUM"]["TOWGS84"].is_Valid() && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
-+ if( m["DATUM"]("TOWGS84") && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
- {
- for(i=0; i<7; i++)
- {
-@@ -1064,7 +1064,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- }
- }
-
-- if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
-+ if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
- {
- Proj4 += CSG_String::Format(SG_T(" +pm=%f"), d);
- }
-@@ -1090,7 +1090,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- // ]
- if( !m.Get_Name().Cmp(SG_T("PROJCS")) )
- {
-- if( !m["PROJECTION"].is_Valid() )
-+ if( !m("PROJECTION") )
- {
- SG_UI_Msg_Add_Error(CSG_String::Format(SG_T(">> WKT: %s"), _TL("no projection specified")));
-
-@@ -1104,9 +1104,9 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- return( false );
- }
-
-- if( !m["GEOGCS"].is_Valid()
-- || !m["GEOGCS"]["DATUM"].is_Valid()
-- || !m["GEOGCS"]["DATUM"]["SPHEROID"].is_Valid()
-+ if( !m("GEOGCS")
-+ || !m["GEOGCS"]("DATUM")
-+ || !m["GEOGCS"]["DATUM"]("SPHEROID")
- || m["GEOGCS"]["DATUM"]["SPHEROID"].Get_Children_Count() != 2
- || !m["GEOGCS"]["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
- || !m["GEOGCS"]["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d < 0.0 )
-@@ -1121,7 +1121,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- Proj4 += CSG_String::Format(SG_T(" +a=%f"), a);
- Proj4 += CSG_String::Format(SG_T(" +b=%f"), d <= 0.0 ? a : a - a / d); // Semiminor radius of the ellipsoid axis
-
-- if( m["GEOGCS"]["DATUM"]["TOWGS84"].is_Valid() && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
-+ if( m["GEOGCS"]["DATUM"]("TOWGS84") && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
- {
- for(i=0; i<7; i++)
- {
-@@ -1129,7 +1129,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- }
- }
-
-- if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
-+ if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
- {
- Proj4 += CSG_String::Format(SG_T(" +pm=%f"), d);
- }
-@@ -1149,7 +1149,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
- }
- }
-
-- if( m["UNIT"].is_Valid() && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
-+ if( m("UNIT") && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
- {
- Proj4 += CSG_String::Format(SG_T(" +to_meter=%f"), d);
- }
=====================================
debian/patches/Use-pkg-config-for-Debian-version-of-dxflib.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Use pkg-config for Debian version of dxflib.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://sourceforge.net/p/saga-gis/patches/14/
-Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/66277194070b60267e968cd8774843758c7bf55f/
-
---- 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], [LIBDXFFOUND=0])
-
- # Checks for header files.
- AC_HEADER_STDC
=====================================
debian/patches/fixwikilink.patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: Fix wiki link in help menu.
-Author: Johan Van de Wauw <johan at vandewauw.be>
-
---- saga.orig/src/saga_core/saga_gui/saga_frame.cpp
-+++ saga/src/saga_core/saga_gui/saga_frame.cpp
-@@ -498,7 +498,7 @@
- //---------------------------------------------------------
- void CSAGA_Frame::On_Help(wxCommandEvent &WXUNUSED(event))
- {
-- if( !Open_WebBrowser(SG_T("http://sourceforge.net/apps/trac/saga-gis/wiki/WikiStart")) )
-+ if( !Open_WebBrowser(SG_T("https://sourceforge.net/p/saga-gis/wiki/Home/")) )
- {
- // DLG_Message_Show(_TL("Online Help"), _TL("SAGA Help"));
- }
=====================================
debian/patches/spelling-errors.patch deleted
=====================================
@@ -1,132 +0,0 @@
-Description: Fix spelling errors.
- * minium -> minimum
- * coodinate -> coordinate
- * contributers -> contributors
- * ins't -> isn't
- * Internation -> International
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://sourceforge.net/p/saga-gis/patches/15/
-Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/ed0361f4a2d25ac727cc184ceaca3125ef6c7dfe/
- https://sourceforge.net/p/saga-gis/code/ci/450e5927b0b0759d23b8b31258cc431e9d5aa844/
-
---- a/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp
-+++ b/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp
-@@ -190,7 +190,7 @@ CFilter_Multi_Dir_Lee::CFilter_Multi_Dir
- Set_Author(_TL("Copyrights (c) 2003 by Andre Ringeler"));
-
- Set_Description (_TW(
-- "The module searches for the minium variance within 16 directions "
-+ "The module searches for the minimum variance within 16 directions "
- "and applies a Lee Filter in the direction of minimum variance. The "
- "filter is edge-preserving and can be used to remove speckle noise "
- "from SAR images or to smooth DTMs. Applied to DTMs, this filter "
---- a/src/modules/terrain_analysis/ta_hydrology/Flow_RecursiveDown.cpp
-+++ b/src/modules/terrain_analysis/ta_hydrology/Flow_RecursiveDown.cpp
-@@ -128,7 +128,7 @@ CFlow_RecursiveDown::CFlow_RecursiveDown
-
- Parameters.Add_Value(
- NULL , "MINDQV" , _TL("DEMON - Min. DQV"),
-- _TL("DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes"),
-+ _TL("DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes"),
- PARAMETER_TYPE_Double , 0.0, 0.0, true, 1.0, true
- );
-
---- a/src/saga_core/saga_gui/res/saga.bra.txt
-+++ b/src/saga_core/saga_gui/res/saga.bra.txt
-@@ -1216,7 +1216,7 @@ TEXT TRANSLATION
- "DEM without Sinks" "MDE sem skins"
- "DEMON" "DEMON"
- "DEMON - Min. DQV" "DEMON - Min. DQV"
--"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Volume mnimo de drenagem do contigente (DQV) para tubos de fluxo rastreados"
-+"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Volume mnimo de drenagem do contigente (DQV) para tubos de fluxo rastreados"
- "DESCRIPTION" "Descrio"
- "DIFF_MEAN" "DIFF_MEAN"
- "DN" "DN"
---- a/src/saga_core/saga_gui/res/saga.ger.txt
-+++ b/src/saga_core/saga_gui/res/saga.ger.txt
-@@ -1216,7 +1216,7 @@ TEXT TRANSLATION
- "DEM without Sinks" ""
- "DEMON" "DEMON"
- "DEMON - Min. DQV" ""
--"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Minimales Abflussquotenvolumen (DQV) fr aufgezeichnete Flierhren"
-+"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes" "DEMON - Minimales Abflussquotenvolumen (DQV) fr aufgezeichnete Flierhren"
- "DESCRIPTION" "BESCHREIBUNG"
- "DIFF_MEAN" "DIFFERENZ_DURCHSCHNITT"
- "DN" ""
---- a/src/saga_core/saga_gui/res/saga.lng.txt
-+++ b/src/saga_core/saga_gui/res/saga.lng.txt
-@@ -1216,7 +1216,7 @@ TEXT TRANSLATION
- "DEM without Sinks" ""
- "DEMON" ""
- "DEMON - Min. DQV" ""
--"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes" ""
-+"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes" ""
- "DESCRIPTION" ""
- "DIFF_MEAN" ""
- "DN" ""
---- a/src/modules/projection/pj_proj4/crs_grid_geogcoords.cpp
-+++ b/src/modules/projection/pj_proj4/crs_grid_geogcoords.cpp
-@@ -79,7 +79,7 @@ CCRS_Grid_GeogCoords::CCRS_Grid_GeogCoor
- Set_Description (_TW(
- "Creates for a given grid geographic coordinate information, "
- "i.e. two grids specifying the longitude and latitude for each cell. "
-- "The coodinate system of the input grid has to be defined. "
-+ "The coordinate system of the input grid has to be defined. "
- ));
-
- Set_Description (Get_Description() + "\n" + CSG_CRSProjector::Get_Description());
---- a/src/saga_core/saga_cmd/man/saga_cmd.1
-+++ b/src/saga_core/saga_cmd/man/saga_cmd.1
-@@ -221,7 +221,7 @@ Multiple input files can be specified by
- On the website of \fIhttp://www.saga\-gis.org\fR, a list of known bugs can be found and new bug reports can be submitted.
- .SH "AUTHORS"
- .IX Header "AUTHORS"
--\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributers. This manual page was written by Johan Van de Wauw.
-+\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributors. This manual page was written by Johan Van de Wauw.
- Both are released under the \s-1GNU\s0 General Public License v2.
- .PP
- More info \fIhttp://www.saga\-gis.org\fR
---- a/src/saga_core/saga_gui/man/saga_gui.1
-+++ b/src/saga_core/saga_gui/man/saga_gui.1
-@@ -142,7 +142,7 @@ Graphical user interface to the System f
- On the project website: \fIhttp://www.saga\-gis.org\fR, a list of known bugs can be found and new bug reports can be submitted.
- .SH "AUTHORS"
- .IX Header "AUTHORS"
--\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributers. This manual page was written by Johan Van de Wauw.
-+\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributors. This manual page was written by Johan Van de Wauw.
- Both are released under the \s-1GNU\s0 General Public License v2.
- .PP
- More info \fIhttp://www.saga\-gis.org\fR
---- a/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.cpp
-+++ b/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.cpp
-@@ -91,7 +91,7 @@ CPC_Reclass_Extract::CPC_Reclass_Extract
- "In addition to these settings, two special cases ('NoData values' and 'other values' not "
- "included in the parameter setup) are supported:\n"
- "In mode (a) and (b) the 'NoData option' is evaluated before the method settings, in mode "
-- "(c) the option is evaluated only if the NoData value ins't included in the lookup table.\n"
-+ "(c) the option is evaluated only if the NoData value isn't included in the lookup table.\n"
- "The 'other values' option is always evaluated after checking the method settings.\n\n")
- );
-
---- a/src/saga_core/saga_api/projections.cpp
-+++ b/src/saga_core/saga_api/projections.cpp
-@@ -1639,7 +1639,7 @@ bool CSG_Projections::_Set_Dictionary(CS
- { "hammer" , " ", "Hammer_Eckert_Greifendorff" , "*) Hammer & Eckert-Greifendorff" },
- { "hatano" , " ", "Hatano_Asymmetrical_Equal_Area" , "*) Hatano Asymmetrical Equal Area" },
- { "igh" , " ", "World_Goode_Homolosine_Land" , "*) Interrupted Goode Homolosine" },
-- { "imw_p" , " ", "Internation_Map_of_the_World_Polyconic" , "*) Internation Map of the World Polyconic" },
-+ { "imw_p" , " ", "International_Map_of_the_World_Polyconic" , "*) International Map of the World Polyconic" },
- { "kav5" , " ", "Kavraisky_V" , "*) Kavraisky V" },
- { "kav7" , " ", "Kavraisky_VII" , "*) Kavraisky VII" },
- { "krovak" , " ", "Krovak" , "Krovak" },
---- a/src/saga_core/saga_gui/res/saga_dic.txt
-+++ b/src/saga_core/saga_gui/res/saga_dic.txt
-@@ -50,7 +50,7 @@ PROJ4 DIR WKT DESC
- "hammer" " " "Hammer_Eckert_Greifendorff" "*) Hammer & Eckert-Greifendorff"
- "hatano" " " "Hatano_Asymmetrical_Equal_Area" "*) Hatano Asymmetrical Equal Area"
- "igh" " " "Interrupted_Goodes_Homolosine" "*) Interrupted Goode's Homolosine"
--"imw_p" " " "Internation_Map_of_the_World_Polyconic" "*) Internation Map of the World Polyconic"
-+"imw_p" " " "International_Map_of_the_World_Polyconic" "*) International Map of the World Polyconic"
- "kav5" " " "Kavraisky_V" "*) Kavraisky V"
- "kav7" " " "Kavraisky_VII" "*) Kavraisky VII"
- "krovak" " " "Krovak" "Krovak"
=====================================
debian/patches/spelling-errors2.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix spelling errors.
- * alignement alignment
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/src/modules/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
-+++ b/src/modules/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
-@@ -80,7 +80,7 @@ CTOBIA::CTOBIA(void)
- "\n"
- "This module computes both a continuous and a categorical TOBIA (""Topography Bedding Intersection Angle"") Index according to Meentemeyer & Moody (2000) "
- "For computation, a slope and a aspect raster (both in radians) determining slope face orientations are required. "
-- "The categorical TOBIA classifies the alignement of a geological structure to Topography into seven classes:\n"
-+ "The categorical TOBIA classifies the alignment of a geological structure to Topography into seven classes:\n"
- "0) Underdip slope\n"
- "1) Dip slope\n"
- "2) Overdip slope\n"
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/commit/1cd33bf354338e404ee511e707aa13f6736d004a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/commit/1cd33bf354338e404ee511e707aa13f6736d004a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190713/7f072181/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list