[Git][debian-gis-team/saga][master] 4 commits: New upstream version 9.0.3+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Jul 5 15:01:56 BST 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / saga
Commits:
757ec8e7 by Bas Couwenberg at 2023-07-05T15:19:21+02:00
New upstream version 9.0.3+dfsg
- - - - -
fd00721b by Bas Couwenberg at 2023-07-05T15:19:43+02:00
Update upstream source from tag 'upstream/9.0.3+dfsg'
Update to upstream version '9.0.3+dfsg'
with Debian dir 12b8e57751b163e8746645576ce25009a5f5ba68
- - - - -
3c560e64 by Bas Couwenberg at 2023-07-05T15:20:02+02:00
New upstream release.
- - - - -
b299aacd by Bas Couwenberg at 2023-07-05T15:20:46+02:00
Set distribution to unstable.
- - - - -
17 changed files:
- debian/changelog
- saga-gis/src/accessories/helper/doxygen_saga_api_chm
- saga-gis/src/accessories/helper/doxygen_saga_api_html
- saga-gis/src/accessories/helper/make_saga_release.bat
- saga-gis/src/accessories/toolchains/ta_ls_factor.xml
- saga-gis/src/saga_core/saga_api/saga_api.h
- saga-gis/src/saga_core/saga_api/tool.cpp
- saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1
- saga-gis/src/saga_core/saga_gdi/3d_view_panel.cpp
- saga-gis/src/saga_core/saga_gui/man/saga_gui.1
- saga-gis/src/saga_core/saga_gui/wksp_base_control.cpp
- saga-gis/src/tools/shapes/shapes_tools/Shapes_Create_Empty.cpp
- saga-gis/src/tools/shapes/shapes_tools/Shapes_Create_Empty.h
- saga-gis/src/tools/terrain_analysis/ta_lighting/geomorphons.cpp
- saga-gis/version.cmake
- saga_setup_win32.iss
- saga_setup_x64.iss
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-saga (9.0.2+dfsg-2) UNRELEASED; urgency=medium
+saga (9.0.3+dfsg-1) unstable; urgency=medium
* Team upload.
+ * New upstream release.
* Bump debhelper compat to 13.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 13 Jun 2023 12:59:16 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 05 Jul 2023 15:20:31 +0200
saga (9.0.2+dfsg-1) unstable; urgency=medium
=====================================
saga-gis/src/accessories/helper/doxygen_saga_api_chm
=====================================
@@ -38,7 +38,7 @@ PROJECT_NAME = "SAGA API"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = v9.0.2
+PROJECT_NUMBER = v9.0.3
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO = ../../../saga_core/saga_gui/res/saga_icon_64.png
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = saga-9.0.2_api_doc
+OUTPUT_DIRECTORY = saga-9.0.3_api_doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -1371,7 +1371,7 @@ GENERATE_HTMLHELP = YES
# written to the html output directory.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-CHM_FILE = ../../saga-9.0.2_api.chm
+CHM_FILE = ../../saga-9.0.3_api.chm
# The HHC_LOCATION tag can be used to specify the location (absolute path
# including file name) of the HTML help compiler (hhc.exe). If non-empty,
=====================================
saga-gis/src/accessories/helper/doxygen_saga_api_html
=====================================
@@ -38,7 +38,7 @@ PROJECT_NAME = "SAGA API"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = v9.0.2
+PROJECT_NUMBER = v9.0.3
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO = ../../../saga_core/saga_gui/res/saga_icon_64.png
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = saga-9.0.2_api_doc
+OUTPUT_DIRECTORY = saga-9.0.3_api_doc
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -1371,7 +1371,7 @@ GENERATE_HTMLHELP = NO
# written to the html output directory.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-CHM_FILE = ../../saga-9.0.2_api.chm
+CHM_FILE = ../../saga-9.0.3_api.chm
# The HHC_LOCATION tag can be used to specify the location (absolute path
# including file name) of the HTML help compiler (hhc.exe). If non-empty,
=====================================
saga-gis/src/accessories/helper/make_saga_release.bat
=====================================
@@ -37,8 +37,8 @@ REM For all bug-fix-releases!
REM Don't forget to activate the variable
REM - SWITCH_TO_BRANCH -
SET SWITCH_TO_BRANCH=saga-9.0
-SET SAGA_VER_TEXT=9.0.2
-SET SAGA_VER_NEXT=9.0.3
+SET SAGA_VER_TEXT=9.0.3
+SET SAGA_VER_NEXT=9.0.4
SET SAGA_VERSION=saga-%SAGA_VER_TEXT%
=====================================
saga-gis/src/accessories/toolchains/ta_ls_factor.xml
=====================================
@@ -31,7 +31,7 @@
</input>
<output varname="LS_FACTOR" type="grid" parent="GRID_SYSTEM">
- <name>LS Factor</name> <colours revert="true">12</colours>
+ <name>LS Factor</name> <colours revert="false">12</colours>
</output>
<option varname="FEET" type="boolean">
=====================================
saga-gis/src/saga_core/saga_api/saga_api.h
=====================================
@@ -86,8 +86,8 @@
//---------------------------------------------------------
#define SAGA_MAJOR_VERSION 9
#define SAGA_MINOR_VERSION 0
-#define SAGA_RELEASE_NUMBER 2
-#define SAGA_VERSION SG_T("9.0.2")
+#define SAGA_RELEASE_NUMBER 3
+#define SAGA_VERSION SG_T("9.0.3")
///////////////////////////////////////////////////////////
=====================================
saga-gis/src/saga_core/saga_api/tool.cpp
=====================================
@@ -1638,11 +1638,11 @@ CSG_String CSG_Tool::_Get_Script_Python(bool bHeader, bool bAllParameters)
if( bHeader )
{
- Script += " List.Get_Data(i).Save('{:s}/{:s}_{:d}.{:s}'.format(Results, List.Get_Name(), i, '" + ext + "'))\n\n";
+ Script += " List.Get_Item(i).Save('{:s}/{:s}_{:d}.{:s}'.format(Results, List.Get_Name(), i, '" + ext + "'))\n\n";
}
else
{
- Script += " Data = List.Get_Data(i)\n";
+ Script += " Data = List.Get_Item(i)\n";
}
}
}
=====================================
saga-gis/src/saga_core/saga_cmd/man/saga_cmd.1
=====================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "SAGA_CMD 1"
-.TH SAGA_CMD 1 "2021-07-07" "9.0.2" " "
+.TH SAGA_CMD 1 "2021-07-07" "9.0.3" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
=====================================
saga-gis/src/saga_core/saga_gdi/3d_view_panel.cpp
=====================================
@@ -720,7 +720,7 @@ void CSG_3DView_Panel::On_Mouse_Wheel(wxMouseEvent &event)
{
if( event.GetWheelRotation() )
{
- m_Projector.Set_zShift(m_Projector.Get_zShift() + event.GetWheelRotation() * 0.001);
+ m_Projector.Set_zShift(m_Projector.Get_zShift() - event.GetWheelRotation() * 0.001);
Update_View();
}
=====================================
saga-gis/src/saga_core/saga_gui/man/saga_gui.1
=====================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "SAGA_GUI 1"
-.TH SAGA_GUI 1 "2021-07-07" "9.0.2" " "
+.TH SAGA_GUI 1 "2021-07-07" "9.0.3" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
=====================================
saga-gis/src/saga_core/saga_gui/wksp_base_control.cpp
=====================================
@@ -455,7 +455,7 @@ wxMenu * CWKSP_Base_Control::Get_Menu(void)
//---------------------------------------------------------
bool CWKSP_Base_Control::_Del_Active(bool bSilent)
{
- if( m_pManager->Get_Type() == WKSP_ITEM_Data_Manager && PROCESS_is_Executing() ) // never allow data deletion during tool execution!
+ if( PROCESS_is_Executing() && m_pManager->Get_Type() != WKSP_ITEM_Map_Manager ) // never allow tool or data deletion while a tool is running!
{
return( false );
}
=====================================
saga-gis/src/tools/shapes/shapes_tools/Shapes_Create_Empty.cpp
=====================================
@@ -1,6 +1,3 @@
-/**********************************************************
- * Version $Id$
- *********************************************************/
///////////////////////////////////////////////////////////
// //
@@ -50,15 +47,6 @@
// //
///////////////////////////////////////////////////////////
-//---------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
//---------------------------------------------------------
#include "Shapes_Create_Empty.h"
@@ -83,10 +71,9 @@
//---------------------------------------------------------
CShapes_Create_Empty::CShapes_Create_Empty(void)
{
- //-----------------------------------------------------
Set_Name (_TL("Create New Shapes Layer"));
- Set_Author ("O. Conrad (c) 2008");
+ Set_Author ("O.Conrad (c) 2008");
Set_Description (CSG_String::Format(_TW(
"Creates a new empty shapes layer of given type, "
@@ -124,7 +111,7 @@ CShapes_Create_Empty::CShapes_Create_Empty(void)
Parameters.Add_Choice("",
"TYPE" , _TL("Shape Type"),
_TL(""),
- CSG_String::Format("%s|%s|%s|%s|",
+ CSG_String::Format("%s|%s|%s|%s",
_TL("Point"),
_TL("Multipoint"),
_TL("Lines"),
@@ -135,7 +122,7 @@ CShapes_Create_Empty::CShapes_Create_Empty(void)
Parameters.Add_Choice("",
"VERTEX" , _TL("Vertex Type"),
_TL(""),
- CSG_String::Format("%s|%s|%s|",
+ CSG_String::Format("%s|%s|%s",
_TL("x, y"),
_TL("x, y, z"),
_TL("x, y, z, m")
@@ -149,15 +136,18 @@ CShapes_Create_Empty::CShapes_Create_Empty(void)
2, 1, true
);
- Parameters.Add_Parameters("",
+ CSG_Parameters *pFields = Parameters.Add_Parameters("",
"FIELDS" , _TL("Attributes"),
_TL("")
- );
+ )->asParameters();
- Set_Field_Count(Parameters("FIELDS")->asParameters(), Parameters("NFIELDS")->asInt());
+ Set_Field_Count(pFields, Parameters("NFIELDS")->asInt());
- Parameters("FIELDS")->asParameters()->Get_Parameter(GET_ID_NAME(0))->Set_Value("ID");
- Parameters("FIELDS")->asParameters()->Get_Parameter(GET_ID_TYPE(0))->Set_Value( 3 );
+ (*pFields)(GET_ID_NAME(0))->Set_Value("ID");
+ (*pFields)(GET_ID_TYPE(0))->Set_Value( 3 );
+
+ (*pFields)(GET_ID_NAME(1))->Set_Value("Name");
+ (*pFields)(GET_ID_TYPE(1))->Set_Value( 0 );
}
@@ -170,7 +160,7 @@ int CShapes_Create_Empty::On_Parameter_Changed(CSG_Parameters *pParameters, CSG_
{
if( pParameter->Cmp_Identifier("NFIELDS") )
{
- Set_Field_Count(pParameters->Get_Parameter("FIELDS")->asParameters(), pParameter->asInt());
+ Set_Field_Count((*pParameters)("FIELDS")->asParameters(), pParameter->asInt());
}
return( CSG_Tool::On_Parameter_Changed(pParameters, pParameter) );
@@ -203,21 +193,24 @@ void CShapes_Create_Empty::Set_Field_Count(CSG_Parameters *pFields, int nFields)
if( pFields && nFields > 0 )
{
- int nCurrent = pFields->Get_Count() / 2;
+ int nCurrent = pFields->Get_Count() / 2;
if( nCurrent < nFields )
{
for(int i=nCurrent; i<nFields; i++)
{
- pFields->Add_String("" , GET_ID_NAME(i), _TL("Name"), _TL(""), _TL("Name"));
- pFields->Add_Choice(GET_ID_NAME(i), GET_ID_TYPE(i), _TL("Type"), _TL(""), Types);
+ CSG_String Name(CSG_String::Format("%s %d", _TL("Field"), i + 1));
+
+ pFields->Add_String("" , GET_ID_NAME(i), Name , _TL("Name"), Name);
+ pFields->Add_Choice(GET_ID_NAME(i), GET_ID_TYPE(i), _TL("Type"), _TL("Type"), Types);
}
}
else if( nCurrent > nFields )
{
- for(int i=nCurrent-1; i>=nFields; i--)
+ for(int i=nCurrent, j=2*nCurrent; i>nFields; i--)
{
- pFields->Del_Parameter(i);
+ pFields->Del_Parameter(--j);
+ pFields->Del_Parameter(--j);
}
}
}
@@ -301,10 +294,9 @@ bool CShapes_Create_Empty::On_Execute(void)
//---------------------------------------------------------
CShapes_Create_Copy::CShapes_Create_Copy(void)
{
- //-----------------------------------------------------
Set_Name (_TL("Copy Shapes"));
- Set_Author ("O. Conrad (c) 2017");
+ Set_Author ("O.Conrad (c) 2017");
Set_Description (_TW(
"Creates a copy of a shapes layer."
@@ -332,7 +324,7 @@ CShapes_Create_Copy::CShapes_Create_Copy(void)
//---------------------------------------------------------
bool CShapes_Create_Copy::On_Execute(void)
{
- CSG_Shapes *pCopy = Parameters("COPY")->asShapes();
+ CSG_Shapes *pCopy = Parameters("COPY")->asShapes();
return( pCopy->Create(*Parameters("SHAPES")->asShapes()) );
}
=====================================
saga-gis/src/tools/shapes/shapes_tools/Shapes_Create_Empty.h
=====================================
@@ -1,6 +1,3 @@
-/**********************************************************
- * Version $Id$
- *********************************************************/
///////////////////////////////////////////////////////////
// //
@@ -50,15 +47,6 @@
// //
///////////////////////////////////////////////////////////
-//---------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
//---------------------------------------------------------
#ifndef HEADER_INCLUDED__Shapes_Create_Empty_H
#define HEADER_INCLUDED__Shapes_Create_Empty_H
@@ -98,7 +86,7 @@ protected:
private:
- void Set_Field_Count (CSG_Parameters *pFields, int nFields);
+ static void Set_Field_Count (CSG_Parameters *pFields, int nFields);
CSG_String Get_Field_Name (int iField);
TSG_Data_Type Get_Field_Type (int iField);
=====================================
saga-gis/src/tools/terrain_analysis/ta_lighting/geomorphons.cpp
=====================================
@@ -119,15 +119,9 @@ CGeomorphons::CGeomorphons(void)
));
Add_Reference("Jasiewicz, J. / Stepinski, T.F.", "2013",
- "Geomorphons — a pattern recognition approach to classification and mapping of landforms",
+ "Geomorphons - a pattern recognition approach to classification and mapping of landforms",
"Geomorphology, 182, 147-156.",
- SG_T("https://www.sciencedirect.com/science/article/pii/S0169555X12005028"), SG_T("ScienceDirect")
- );
-
- Add_Reference("Stepinski, T.F. / Jasiewicz, J.", "2011",
- "Geomorphons — a pattern recognition approach to classification and mapping of landforms",
- "In: Hengl, T. / Evans, I.S. / Wilson, J.P. / Gould, M. [Eds.]: Proceedings of Geomorphometry 2011, Redlands, 109-112.",
- SG_T("http://geomorphometry.org/system/files/StepinskiJasiewicz2011geomorphometry.pdf"), SG_T("pdf at geomorphometry.org")
+ SG_T("https://doi.org/10.1016/j.geomorph.2012.11.005"), SG_T("doi:10.1016/j.geomorph.2012.11.005")
);
//-----------------------------------------------------
=====================================
saga-gis/version.cmake
=====================================
@@ -1,7 +1,7 @@
# The version number.
set (SAGA_VERSION_MAJOR 9)
set (SAGA_VERSION_MINOR 0)
-set (SAGA_VERSION_PATCH 2)
+set (SAGA_VERSION_PATCH 3)
# get git commit hash (or dirty if git is not installed)
=====================================
saga_setup_win32.iss
=====================================
@@ -1,5 +1,5 @@
-; To build installer (for example, saga-9.0.2_setup.exe).
-; - Unzip the SAGA binary files in their own folder (for example, saga-9.0.2.zip).
+; To build installer (for example, saga-9.0.3_setup.exe).
+; - Unzip the SAGA binary files in their own folder (for example, saga-9.0.3.zip).
; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.).
; - Open saga.iss in Inno Setup.
; - Choose Build | Compile.
@@ -7,7 +7,7 @@
[Setup]
AppName=SAGA - System for Automated Geoscientific Analyses
-AppVerName=SAGA 9.0.2
+AppVerName=SAGA 9.0.3
DefaultDirName={commonpf}\SAGA
DefaultGroupName=SAGA
@@ -19,9 +19,9 @@ Compression=lzma
SolidCompression=yes
OutputDir=.
-OutputBaseFilename=saga-9.0.2_win32_setup
+OutputBaseFilename=saga-9.0.3_win32_setup
-VersionInfoVersion=9.0.2.0
+VersionInfoVersion=9.0.3.0
VersionInfoCompany=SAGA User Group Association
VersionInfoCopyright=(c) 2005-2018 by O. Conrad
VersionInfoDescription=SAGA single-file installer
@@ -47,5 +47,5 @@ Name: "{commondesktop}\SAGA"; Filename: "{app}\saga_gui.exe"; WorkingDir: "{app}
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\saga_gui.exe"; Flags: uninsdeletekey
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}"
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.2"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.2"; ValueType: string; ValueName: "Version"; ValueData: "9.0.2.0"
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.3"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.3"; ValueType: string; ValueName: "Version"; ValueData: "9.0.3.0"
=====================================
saga_setup_x64.iss
=====================================
@@ -1,5 +1,5 @@
-; To build installer (for example, saga-9.0.2_setup.exe).
-; - Unzip the SAGA binary files in their own folder (for example, saga-9.0.2.zip).
+; To build installer (for example, saga-9.0.3_setup.exe).
+; - Unzip the SAGA binary files in their own folder (for example, saga-9.0.3.zip).
; - Place saga.iss and saga_readme.rtf in the SAGA folder (contains saga_gui.exe, etc.).
; - Open saga.iss in Inno Setup.
; - Choose Build | Compile.
@@ -7,7 +7,7 @@
[Setup]
AppName=SAGA - System for Automated Geoscientific Analyses
-AppVerName=SAGA 9.0.2
+AppVerName=SAGA 9.0.3
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64
@@ -22,9 +22,9 @@ Compression=lzma
SolidCompression=yes
OutputDir=.
-OutputBaseFilename=saga-9.0.2_x64_setup
+OutputBaseFilename=saga-9.0.3_x64_setup
-VersionInfoVersion=9.0.2.0
+VersionInfoVersion=9.0.3.0
VersionInfoCompany=SAGA User Group Association
VersionInfoCopyright=(c) 2005-2018 by O. Conrad
VersionInfoDescription=SAGA single-file installer
@@ -50,5 +50,5 @@ Name: "{commondesktop}\SAGA"; Filename: "{app}\saga_gui.exe"; WorkingDir: "{app}
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\saga_gui.exe"; Flags: uninsdeletekey
Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\saga_gui.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}"
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.2"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
-Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.2"; ValueType: string; ValueName: "Version"; ValueData: "9.0.2.0"
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.3"; ValueType: string; ValueName: "InstallDir"; ValueData: "{app}"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\SAGA User Group Association\SAGA\9.0.3"; ValueType: string; ValueName: "Version"; ValueData: "9.0.3.0"
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/ef7a7027480d5b192c865e919a50911f26d2ce9a...b299aacd2b1218dd54ab91f1135da74e3b79d6ca
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/ef7a7027480d5b192c865e919a50911f26d2ce9a...b299aacd2b1218dd54ab91f1135da74e3b79d6ca
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/20230705/40c09376/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list