Merge branch 'master' into tokens

7 files changed, 51 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c43a1f4..6bc01461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 12 10:43:41 AM CEST 2024
+    Releasing taler-merchant 0.10.2. -CG
+
+Wed Nov 29 09:06:49 AM JST 2023
+    Creating bugfix release taler-merchant 0.9.3a. -CG
+
 Wed Nov 29 09:06:49 AM JST 2023
     Creating bugfix release taler-merchant 0.9.3a. -CG
 
@@ -6,61 +12,61 @@ Sat 28 Aug 2021 05:27:02 PM CEST
     payment/refund (#6995). -CG/BP
     Used database-driven long-polling on all long-pollers
     for multi-process deployments. (#6956) -CG
-	Releasing taler-merchant 0.8.4. -CG
+    Releasing taler-merchant 0.8.4. -CG
 
 Tue 24 Aug 2021 03:08:53 PM CEST
-	Releasing taler-merchant 0.8.3. -CG
+    Releasing taler-merchant 0.8.3. -CG
 
 Tue 17 Aug 2021 03:08:53 PM CEST
-	Releasing taler-merchant 0.8.2. -CG
+    Releasing taler-merchant 0.8.2. -CG
 
 Thu 22 Apr 2021 11:30:13 PM CEST
     Integrate new single-page app. -CG/SM
 
 Tue 10 Nov 2020 01:08:46 PM CET
-	Major revamp of the entire API (now 1:0:0), changing the names of
-	many endpoints for better consistency.
-	Adding support for (optional) inventory management.
-	Releasing taler-merchant 0.8.0. -CG/JB
+    Major revamp of the entire API (now 1:0:0), changing the names of
+    many endpoints for better consistency.
+    Adding support for (optional) inventory management.
+    Releasing taler-merchant 0.8.0. -CG/JB
 
 Sun 12 Apr 2020 08:45:11 PM CEST
-	Changed /tip-pickup API to withdraw directly from the exchange
-	and return blind signatures, instead of having the wallet do it (#6173). -CG
+    Changed /tip-pickup API to withdraw directly from the exchange
+    and return blind signatures, instead of having the wallet do it (#6173). -CG
 
 Fri 10 Apr 2020 09:01:22 PM CEST
-	Changing refund API to have the merchant backend make the /refund
-	request to the exchange instead of having the wallet do it (#5299). -CG
+    Changing refund API to have the merchant backend make the /refund
+    request to the exchange instead of having the wallet do it (#5299). -CG
 
 Tue 31 Mar 2020 04:17:58 PM CEST
-	Releasing taler-merchant 0.7.0. -CG
+    Releasing taler-merchant 0.7.0. -CG
 
 Tue 24 Dec 2019 11:01:21 PM CET
-	Releasing taler-merchant 0.6.0. -CG
+    Releasing taler-merchant 0.6.0. -CG
 
 Sat 17 Aug 2019 10:03:38 PM CEST
-	Remove "currency" field from exchange database, as we only
-	support one currency per merchant backend anyway. -CG
+    Remove "currency" field from exchange database, as we only
+    support one currency per merchant backend anyway. -CG
 
 Wed Apr  4 00:19:38 CEST 2018
-	Releasing taler-merchant-0.5.0 -FD
+    Releasing taler-merchant-0.5.0 -FD
 
 Mon Jan 22 21:54:42 CET 2018
-	Address #5262. -CG
+    Address #5262. -CG
 
 Tue Jan 2 00:27:29 2018
-	Implement #5158 (proper handling of aborted payments). -CG
+    Implement #5158 (proper handling of aborted payments). -CG
 
 Wed Dec 27 11:21:43 2017
-	Complete logic to allow /pay to span coins from multiple exchanges. -CG
+    Complete logic to allow /pay to span coins from multiple exchanges. -CG
 
 Wed Dec 13 21:50:59 2017
-	Use new wire transfer logic in payments generator. -CG
+    Use new wire transfer logic in payments generator. -CG
 
 Thu Dec 7 07:42:40 2017
-	Implemented new tipping feature (now with private keys in files). -CG
+    Implemented new tipping feature (now with private keys in files). -CG
 
 Wed Oct 18 15:33:23 CEST 2017
-	Releasing taler-merchant 0.4.0. -CG
+    Releasing taler-merchant 0.4.0. -CG
 
 Thu Jun 22 15:12:37 CEST 2017
     Implementing /refund
@@ -73,16 +79,16 @@ Tue Jun  6 14:30:43 CEST 2017
     /history API now has the way to query from a starting base date
     ahead into the future.
     Memory leak fixes. -CG/MS
-	Releasing taler-merchant 0.3.0. -CG
+    Releasing taler-merchant 0.3.0. -CG
 
 Mon Mar  6 17:57:51 CET 2017
-	Add support for wire fee calculations to /pay handling (#4935),
-	and adding setting "max_wire_fee" and "wire_fee_amortization"
-	in contract from defaults. -CG
+    Add support for wire fee calculations to /pay handling (#4935),
+    and adding setting "max_wire_fee" and "wire_fee_amortization"
+    in contract from defaults. -CG
 
 Mon Mar  6 00:59:25 CET 2017
-	Implement BIND_TO option to allow binding backend to a particular
-	IP address (#4752).  Enabling use of dual-stack by default. -CG
+    Implement BIND_TO option to allow binding backend to a particular
+    IP address (#4752).  Enabling use of dual-stack by default. -CG
 
 Thu Dec 15 10:37:08 CET 2016
     Implementing:
@@ -91,8 +97,8 @@ Thu Dec 15 10:37:08 CET 2016
     by looking for their hashcodes.
 
 Fri Nov 18 18:54:07 CET 2016
-	Misc. minor updates to match API changes from exchange 0.2.
-	Releasing taler-merchant 0.2.0. -CG
+    Misc. minor updates to match API changes from exchange 0.2.
+    Releasing taler-merchant 0.2.0. -CG
 
 Mon Oct 10 16:27:57 CEST 2016
     Implementing:
@@ -103,8 +109,8 @@ Mon Oct 10 16:27:57 CEST 2016
     same backend. -MS
 
 Tue Jun  7 15:17:45 CEST 2016
-	Store signing key used by exchange in DB.  Might be useful
-	in the future when we implement GC for the backenddb. -CG
+    Store signing key used by exchange in DB.  Might be useful
+    in the future when we implement GC for the backenddb. -CG
 
 Wed Jun  1 17:27:36 CEST 2016
-	Releasing taler-merchant-0.0.0. -CG
+    Releasing taler-merchant-0.0.0. -CG
diff --git a/configure.ac b/configure.ac
index ccc71965..3dd98985 100644
--- 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],[0.10.1],[taler-bug@gnunet.org])
+AC_INIT([taler-merchant],[0.10.2],[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/contrib/ci/jobs/4-deb-package/version.sh b/contrib/ci/jobs/4-deb-package/version.sh
index a6e740af..52031b23 100755
--- a/contrib/ci/jobs/4-deb-package/version.sh
+++ b/contrib/ci/jobs/4-deb-package/version.sh
@@ -7,7 +7,7 @@ if [ -z "${BRANCH}" ]; then
 else
         # "Unshallow" our checkout, but only our current branch, and exclude the submodules.
 	git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
-	RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --always --abbrev=0 HEAD || exit 1)
+	RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-dev*' --always --abbrev=0 HEAD || exit 1)
 	commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
 	if [ "${commits}" = "0" ]; then
 		git describe --tag HEAD | sed -r 's/^v//' || exit 1
diff --git a/debian/changelog b/debian/changelog
index 4944eb80..c04b84f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.10.2) unstable; urgency=low
+
+  * Update various submodules to latest version.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Fri, 12 Apr 2024 09:50:12 +0200
+
 taler-merchant (0.10.1) unstable; urgency=low
 
   * Implement cache control headers for /config
diff --git a/debian/control b/debian/control
index 9977ac39..6fa6e6c1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  debhelper-compat (= 12),
  gettext,
  libgnunet-dev (>=0.21),
- libtalerexchange-dev (>=0.9.4),
+ libtalerexchange-dev (>=0.10.2),
  libpq-dev (>=14.0),
  po-debconf,
  libqrencode-dev,
@@ -48,7 +48,7 @@ Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
  libtalermerchant (= ${binary:Version}),
- libtalerexchange (>= 0.9.4),
+ libtalerexchange (>= 0.10.2),
  adduser,
  lsb-base,
  netbase,
@@ -69,7 +69,7 @@ Package: libtalermerchant-dev
 Section: libdevel
 Architecture: any
 Depends:
- libtalerexchange-dev (>= 0.9.4),
+ libtalerexchange-dev (>= 0.10.2),
  libgnunet-dev (>=0.21),
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/doc/doxygen/taler.doxy b/doc/doxygen/taler.doxy
index d9785d42..e5185031 100644
--- 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         = 0.9.3
+PROJECT_NUMBER         = 0.10.2
 PROJECT_LOGO           = logo.svg
 OUTPUT_DIRECTORY       = .
 CREATE_SUBDIRS         = YES
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject af8c69dfe397ff4bed7abca98ed8f3b2ed70541
+Subproject b8d2d2fa2ed2a771880f451725176f256583cb2