[Git][debian-gis-team/routino][master] 4 commits: New upstream version 3.4.1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Jul 2 06:00:58 BST 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / routino
Commits:
85376870 by Bas Couwenberg at 2023-07-02T06:53:16+02:00
New upstream version 3.4.1
- - - - -
29e4c1b7 by Bas Couwenberg at 2023-07-02T06:53:33+02:00
Update upstream source from tag 'upstream/3.4.1'
Update to upstream version '3.4.1'
with Debian dir 27f960c54bfd98608ea48e587a8fe07f4b96726d
- - - - -
a724c6f6 by Bas Couwenberg at 2023-07-02T06:54:26+02:00
New upstream release.
- - - - -
eef6823f by Bas Couwenberg at 2023-07-02T06:55:43+02:00
Set distribution to unstable.
- - - - -
7 changed files:
- ChangeLog
- debian/changelog
- doc/NEWS.txt
- doc/README.txt
- doc/html/readme.html
- src/sorting.c
- src/version.h
Changes:
=====================================
ChangeLog
=====================================
@@ -1,7 +1,24 @@
+2023-07-01 Andrew M. Bishop <amb>
+
+ Version 3.4.1 released.
+
+2023-07-01 [r2157-2158] Andrew M. Bishop <amb>
+
+ * FILES, doc/NEWS.txt, doc/README.txt, doc/html/readme.html,
+ src/version.h: Update to version 3.4.1.
+
+ * src/sorting.c: Fix a bug that was introduced in r2138 (sorting
+ failure in some cases, unclear which but not found in tests of
+ slim mode or when using multiple threads).
+
2023-06-11 Andrew M. Bishop <amb>
Version 3.4 released.
+2023-06-11 [r2153] Andrew M. Bishop <amb>
+
+ * doc/NEWS.txt, doc/html/readme.html: Update to version 3.4.
+
2023-06-11 [r2152] Andrew M. Bishop <amb>
* extras/find-fixme/web/www/fixme.openlayers.js,
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+routino (3.4.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 02 Jul 2023 06:55:28 +0200
+
routino (3.4-1) unstable; urgency=medium
* New upstream release.
=====================================
doc/NEWS.txt
=====================================
@@ -1,3 +1,13 @@
+Version 3.4.1 of Routino released : Sat Jul 1 2023
+--------------------------------------------------
+
+Bug fixes:
+ Fix error with sorting (without threads, not slim mode).
+
+
+Note: This version is compatible with databases from versions 2.7.1 - 3.4.
+
+
Version 3.4 of Routino released : Sun Jun 11 2023
-------------------------------------------------
=====================================
doc/README.txt
=====================================
@@ -113,6 +113,7 @@ Status
Version 3.3.2 of Routino was released on 18th September 2019.
Version 3.3.3 of Routino was released on 30th December 2020.
Version 3.4 of Routino was released on 11th June 2023.
+ Version 3.4.1 of Routino was released on 1st July 2023.
The full version history is available in the NEWS.txt file.
=====================================
doc/html/readme.html
=====================================
@@ -178,6 +178,8 @@ Version 3.3.2 of Routino was released on 18th September 2019.
Version 3.3.3 of Routino was released on 30th December 2020.
<br>
Version 3.4 of Routino was released on 11th June 2023.
+<br>
+Version 3.4.1 of Routino was released on 1st July 2023.
<p>
@@ -214,7 +216,18 @@ The full version history is available in the NEWS.txt file.
<b>Note:</b> This version is compatible with databases from versions 2.7.1 - 3.3.3.
-<h3 id="H_1_5_2" title="Other Versions">Other Versions</h3>
+<h3 id="H_1_5_2" title="Changes 3.4.1">Changes in Version 3.4.1</h3>
+
+<dl>
+ <dt>Bug fixes:
+ <dd>Fix error with sorting (without threads, not slim mode).
+</dl>
+
+<p>
+<b>Note:</b> This version is compatible with databases from versions 2.7.1 - 3.4.
+
+
+<h3 id="H_1_5_3" title="Other Versions">Other Versions</h3>
There is a version of Routino (in subversion, on the branch called
"destination-access") that allows the first and last waypoint of a
=====================================
src/sorting.c
=====================================
@@ -143,7 +143,8 @@ index_t filesort_fixed(int fd_in,int fd_out,size_t itemsize,int (*pre_sort_funct
return(0);
if((nitems*(itemsize+sizeof(void*)))<(option_filesort_ramsize/option_filesort_threads))
- /* use one thread */;
+ /* use one thread */
+ nitems=nitems+1;
else if((nitems*(itemsize+sizeof(void*)))<option_filesort_ramsize)
nitems=1+nitems/option_filesort_threads;
else
@@ -545,7 +546,8 @@ index_t filesort_vary(int fd_in,int fd_out,int (*pre_sort_function)(void*,index_
Assume that data+FILESORT_VARALIGN+sizeof(void*) is 4*data. */
if((datasize*4)<option_filesort_ramsize/option_filesort_threads)
- /* use one thread */;
+ /* use one thread */
+ datasize=datasize*4;
else if((datasize*4)<option_filesort_ramsize)
datasize=(datasize*4)/option_filesort_threads;
else
=====================================
src/version.h
=====================================
@@ -23,7 +23,7 @@
#ifndef VERSION_H
#define VERSION_H /*+ To stop multiple inclusions. +*/
-#define ROUTINO_VERSION "3.4"
+#define ROUTINO_VERSION "3.4.1"
#define ROUTINO_URL "<http://www.routino.org/>"
View it on GitLab: https://salsa.debian.org/debian-gis-team/routino/-/compare/e07d15aa167ed202ed17bf4924140e1bb54242a6...eef6823f8168623a34a8fbe2562631fbdb6104a6
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/routino/-/compare/e07d15aa167ed202ed17bf4924140e1bb54242a6...eef6823f8168623a34a8fbe2562631fbdb6104a6
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/20230702/3df9aa6a/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list