merchant

commit fea2ab501c80d7de1045d6d6f0422b56f0b9d8a4
parent 531169bde6d5e88efeffd67c755a8087e686eb4e
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Fri, 25 Jul 2025 16:34:32 +0200

Merge branch 'master' into dev/bohdan-potuzhnyi/donau-integration

Diffstat:
M
configure.ac
 | 
2
+-
M
debian/changelog
 | 
12
++++++++++++
M
doc/doxygen/taler.doxy
 | 
2
+-
M
src/backend/taler-merchant-depositcheck.c
 | 
2
+-
M
src/backend/taler-merchant-httpd_private-get-orders.c
 | 
2
+-

5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -18,7 +18,7 @@
 # This configure file is in the public domain
 
 AC_PREREQ([2.69])
-AC_INIT([taler-merchant],[1.0.5],[taler-bug@gnunet.org])
+AC_INIT([taler-merchant],[1.0.7],[taler-bug@gnunet.org])
 AC_CONFIG_SRCDIR([src/backend/taler-merchant-httpd.c])
 AC_CONFIG_HEADERS([taler_merchant_config.h])
 # support for non-recursive builds
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+taler-merchant (1.0.7) unstable; urgency=low
+
+  * Release 1.0.7.
+
+ -- Florian Dold <florian@dold.me>  Thu, 24 Jul 2025 12:44:04 +0200
+
+taler-merchant (1.0.6) unstable; urgency=low
+
+  * Release 1.0.6.
+
+ -- Florian Dold <florian@dold.me>  Thu, 24 Jul 2025 12:17:30 +0200
+
 taler-merchant (1.0.5) unstable; urgency=low
 
   * Release 1.0.5.
diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "GNU Taler: Merchant"
-PROJECT_NUMBER         = 1.0.5
+PROJECT_NUMBER         = 1.0.7
 PROJECT_LOGO           = logo.svg
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
diff --git a/src/backend/taler-merchant-depositcheck.c b/src/backend/taler-merchant-depositcheck.c
@@ -519,7 +519,7 @@ deposit_get_cb (
   default:
     {
       enum GNUNET_DB_QueryStatus qs;
-      bool retry_needed;
+      bool retry_needed = false;
 
       GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                   "Exchange %s returned tracking failure for deposited coin %s: %u\n",
diff --git a/src/backend/taler-merchant-httpd_private-get-orders.c b/src/backend/taler-merchant-httpd_private-get-orders.c
@@ -20,7 +20,7 @@
  */
 #include "platform.h"
 #include "taler-merchant-httpd_private-get-orders.h"
-#include <taler/taler_merchant_util.h>
+#include <taler_merchant_util.h>
 #include <taler/taler_json_lib.h>
 #include <taler/taler_dbevents.h>