-proper version bumping

3 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b183f7be..dbb5b4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat 28 Aug 2021 05:27:02 PM CEST
+    Improved language on HTML pages shown to user on
+    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
+
+Tue 24 Aug 2021 03:08:53 PM CEST
+        Releasing taler-merchant 0.8.3. -CG
+
 Tue 17 Aug 2021 03:08:53 PM CEST
         Releasing taler-merchant 0.8.2. -CG
 
diff --git a/configure.ac b/configure.ac
index 8548a9ae..dd3943be 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.8.3], [taler-bug@gnunet.org])
+AC_INIT([taler-merchant], [0.8.4], [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
index 5062061b..b33d2c60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.8.4) unstable; urgency=low
+
+  * Official release of GNU Taler merchant 0.8.4.
+
+ -- Christian Grothoff <grothoff@taler.net>  Sat, 28 Aug 2021 23:23:21 +0200
+
 taler-merchant (0.8.2-5) unstable; urgency=low
 
   * Database setup tweaks.