summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-12-20 20:10:46 +0100
committerChristian Grothoff <christian@grothoff.org>2019-12-20 20:10:46 +0100
commit8af89ff197715427763c1c80d62d96e517760434 (patch)
tree9688037931b7d58b13d9cb4469b98a0954c6a38b
parentb554f1e9095e5c910c6cf58e040565d0ca911bca (diff)
downloadexchange-8af89ff197715427763c1c80d62d96e517760434.tar.gz
exchange-8af89ff197715427763c1c80d62d96e517760434.tar.bz2
exchange-8af89ff197715427763c1c80d62d96e517760434.zip
misc release preparations: mostly fixing 'make dist' target
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac2
-rw-r--r--contrib/Makefile.am5
-rw-r--r--doc/Makefile.am13
m---------doc/prebuilt0
-rw-r--r--src/auditor/Makefile.am1
-rw-r--r--src/bank-lib/Makefile.am2
-rw-r--r--src/benchmark/Makefile.am8
-rw-r--r--src/include/Makefile.am1
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/backoff.h2
-rw-r--r--src/wire-plugins/Makefile.am5
13 files changed, 29 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index d218f4ec..1efe01ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Fri 20 Dec 2019 07:39:14 PM CET
+ Releasing GNU Taler 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 exchange anyway. -CG
diff --git a/Makefile.am b/Makefile.am
index 98318ccc..3a422a9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,5 @@ endif
@DX_RULES@
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = \
- AUTHORS \
- Doxyfile
+EXTRA_DIST = \
+ AUTHORS
diff --git a/configure.ac b/configure.ac
index 2a2ab640..95e590bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
#
#
AC_PREREQ([2.69])
-AC_INIT([taler-exchange], [0.5.0], [taler-bug@gnunet.org])
+AC_INIT([taler-exchange], [0.6.0], [taler-bug@gnunet.org])
AC_CONFIG_SRCDIR([src/util/util.c])
AC_CONFIG_HEADERS([taler_config.h])
# support for non-recursive builds
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f11fbe92..dfe37429 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,6 +1,9 @@
SUBDIRS = . tos pp
EXTRA_DIST = \
+ auditor-report.tex.j2 \
coverage.sh \
gnunet.tag \
- microhttpd.tag
+ microhttpd.tag \
+ render.py
+
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3c844e5c..d1d10c52 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,16 @@ man_MANS = \
prebuilt/man/taler.conf.5
info_TEXINFOS = \
- prebuilt/texinfo/taler-exchange.texi
+ prebuilt/texinfo/taler-exchange.texi \
+ prebuilt/texinfo/taler-bank.texi \
+ prebuilt/texinfo/onboarding.texi
EXTRA_DIST = \
- $(man_MANS)
+ $(man_MANS) \
+ doxygen/taler.doxy \
+ $(info_TEXINFOS) \
+ prebuilt/texinfo/onboarding-figures/exchange-db.png \
+ prebuilt/texinfo/onboarding-figures/arch-api.png \
+ prebuilt/texinfo/taler-exchange-figures/exchange-db.png \
+ prebuilt/texinfo/taler-bank-figures/exchange-db.png \
+ prebuilt/texinfo/taler-bank-figures/arch-api.png
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject ca53235ccfa0458ebf11c204888ca370e20ec3f
+Subproject 934a6a18301e81c4fd1b3a8cda2dc13dca4741c
diff --git a/src/auditor/Makefile.am b/src/auditor/Makefile.am
index a1bb4d24..b942076f 100644
--- a/src/auditor/Makefile.am
+++ b/src/auditor/Makefile.am
@@ -104,6 +104,7 @@ TESTS = $(check_SCRIPTS)
EXTRA_DIST = \
auditor.conf \
+ test-auditor.conf \
generate-auditor-basedb.sh \
generate-auditor-basedb.conf \
generate-auditor-basedb-template.conf \
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index 35173e48..1d833fca 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -56,7 +56,7 @@ libtalerfakebank_la_LDFLAGS = \
-no-undefined
libtalerfakebank_la_SOURCES = \
fakebank_history.c \
- fakebank.c
+ fakebank.c fakebank.h
libtalerfakebank_la_LIBADD = \
$(top_builddir)/src/json/libtalerjson.la \
-lgnunetjson \
diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am
index 4444d3d1..c90f1f0d 100644
--- a/src/benchmark/Makefile.am
+++ b/src/benchmark/Makefile.am
@@ -31,10 +31,6 @@ taler_exchange_benchmark_LDADD = \
-ljansson
EXTRA_DIST = \
- taler-exchange-benchmark.conf \
- bank_details.json \
- merchant_details.json \
- test_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv \
- test_benchmark_home/.config/taler/test.json \
- test_benchmark_home/.config/taler/sepa.json
+ benchmark.conf \
+ exchange_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 645bdc9f..af91f117 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -25,6 +25,7 @@ talerinclude_HEADERS = \
taler_exchangedb_plugin.h \
taler_fakebank_lib.h \
taler_json_lib.h \
+ taler_testing_auditor_lib.h \
taler_testing_lib.h \
taler_util.h \
taler_mhd_lib.h \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f5251524..272cc3d6 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -16,6 +16,7 @@ libtalerexchange_la_LDFLAGS = \
-version-info 4:0:0 \
-no-undefined
libtalerexchange_la_SOURCES = \
+ backoff.h \
exchange_api_curl_defaults.c exchange_api_curl_defaults.h \
exchange_api_common.c \
exchange_api_handle.c exchange_api_handle.h \
diff --git a/src/lib/backoff.h b/src/lib/backoff.h
index 2af41e7c..e62e1d90 100644
--- a/src/lib/backoff.h
+++ b/src/lib/backoff.h
@@ -16,7 +16,7 @@
*/
/**
- * @file exchange-lib/backoff.h
+ * @file lib/backoff.h
* @brief backoff computation for the exchange lib
* @author Florian Dold
*/
diff --git a/src/wire-plugins/Makefile.am b/src/wire-plugins/Makefile.am
index 468e95a0..0ee4c8f9 100644
--- a/src/wire-plugins/Makefile.am
+++ b/src/wire-plugins/Makefile.am
@@ -10,10 +10,7 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
EXTRA_DIST = \
test_wire_plugin.conf \
- test_wire_plugin_transactions_taler-bank.conf \
- test_wire_plugin_key.priv \
- test_wire_plugin_test.json \
- test_wire_plugin_sepa.json
+ test_wire_plugin_transactions_taler-bank.conf
plugindir = $(libdir)/taler