[taler-taler-mdb] 07/07: Merge remote-tracking branch 'origin/dev/nora/ads'

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-mdb.

commit ab7aa24fc8326edea22cc4f40eb3289d88806476
Merge: aa9c8a4 0cd27d0
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jan 14 00:58:20 2024 +0100

    Merge remote-tracking branch 'origin/dev/nora/ads'

 contrib/Makefile.am                                |  36 +++++------
 contrib/ads/png/chocolate-5s.png                   | Bin 0 -> 146468 bytes
 contrib/ads/png/chocolate2-5s.png                  | Bin 0 -> 205149 bytes
 contrib/ads/png/notsnack-7s.png                    | Bin 0 -> 186210 bytes
 contrib/ads/png/swissknife-10s.png                 | Bin 0 -> 171669 bytes
 contrib/ads/svg/chocolate-5s.svg                   |  71 +++++++++++++++++++++
 contrib/ads/svg/chocolate2-5s.svg                  |  71 +++++++++++++++++++++
 contrib/ads/svg/notsnack-7s.svg                    |  14 ++++
 contrib/ads/svg/swissknife-10s.svg                 |  71 +++++++++++++++++++++
 contrib/convert-svgs-to-pngs                       |  55 ++++++++++++++--
 contrib/{ => err}/png/backend-auth-failure.png     | Bin
 .../png/backend-dns-resolution-failure.png         | Bin
 contrib/{ => err}/png/backend-no-webserver.png     | Bin
 contrib/err/png/backend-unreachable.png            | Bin 0 -> 38389 bytes
 contrib/{ => err}/png/backend-x509-cert-bad.png    | Bin
 contrib/{ => err}/png/child-died.png               | Bin
 contrib/{ => err}/png/err-num-read-fail.png        | Bin
 contrib/{ => err}/png/maintenance.png              | Bin
 contrib/{ => err}/png/no-ip.png                    | Bin
 contrib/{ => err}/svg/backend-auth-failure.svg     |   0
 .../svg/backend-dns-resolution-failure.svg         |   0
 contrib/{ => err}/svg/backend-no-webserver.svg     |   0
 contrib/{ => err}/svg/backend-unreachable.svg      |   0
 contrib/{ => err}/svg/backend-x509-cert-bad.svg    |   0
 contrib/{ => err}/svg/child-died.svg               |   0
 contrib/{ => err}/svg/err-num-read-fail.svg        |   0
 contrib/{ => err}/svg/maintenance.svg              |   0
 contrib/{ => err}/svg/no-ip.svg                    |   0
 contrib/png/backend-unreachable.png                | Bin 38390 -> 0 bytes
 29 files changed, 294 insertions(+), 24 deletions(-)

diff --cc contrib/Makefile.am
index d0e7036,43d51db..b197b0b
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@@ -2,18 -2,17 +2,18 @@@ SUBDIRS = 
  
  imgdir=$(datadir)/taler/mdb
  img_DATA = \
-   png/backend-auth-failure.png \
-   png/backend-no-webserver.png \
-   png/backend-x509-cert-bad.png \
-   png/err-num-read-fail.png \
-   png/no-ip.png \
-   png/backend-dns-resolution-failure.png \
-   png/backend-unreachable.png \
-   png/child-died.png \
-   png/maintenance.png
+   err/png/backend-auth-failure.png \
+   err/png/backend-no-webserver.png \
+   err/png/backend-x509-cert-bad.png \
+   err/png/err-num-read-fail.png \
+   err/png/no-ip.png \
+   err/png/backend-dns-resolution-failure.png \
+   err/png/backend-unreachable.png \
+   err/png/child-died.png \
+   err/png/maintenance.png
  
  bin_SCRIPTS = \
 +  taler-mdb-ads.sh \
    taler-mdb-show.sh \
    taler-mdb-network-check.sh
  

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.