[taler-merchant] branch master updated: allow 'or'

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new d58edf52 allow 'or'
d58edf52 is described below

commit d58edf5244ae616ef5e7f549c51ba67fb2aeb1b1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jul 14 13:17:11 2021 +0200

    allow 'or'
---
 debian/control                         | 2 +-
 debian/libtalermerchant.substvars      | 3 ---
 debian/taler-merchant.postrm.debhelper | 6 ------
 debian/taler-merchant.substvars        | 3 ---
 4 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 9a240cd6..0e781fe0 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends:
  libqrencode-dev,
  zlib1g-dev,
  libjansson-dev,
- libcurl4-openssl-dev,
+ libcurl4-openssl-dev | libcurl4-gnutls-dev,
  libsodium-dev,
  texinfo
 Build-Conflicts:
diff --git a/debian/libtalermerchant.substvars 
b/debian/libtalermerchant.substvars
deleted file mode 100644
index 7398c72d..00000000
--- a/debian/libtalermerchant.substvars
+++ /dev/null
@@ -1,3 +0,0 @@
-shlibs:Depends=libc6 (>= 2.14), libcurl3-gnutls (>= 7.16.2), libgnunet (>= 
0.14.1), libjansson4 (>= 2.0.1), libtalerexchange (>= 0.9.0)
-misc:Depends=
-misc:Pre-Depends=
diff --git a/debian/taler-merchant.postrm.debhelper 
b/debian/taler-merchant.postrm.debhelper
deleted file mode 100644
index 5714178c..00000000
--- a/debian/taler-merchant.postrm.debhelper
+++ /dev/null
@@ -1,6 +0,0 @@
-# Automatically added by dh_installdebconf/13.3.4
-if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
-       . /usr/share/debconf/confmodule
-       db_purge
-fi
-# End automatically added section
diff --git a/debian/taler-merchant.substvars b/debian/taler-merchant.substvars
deleted file mode 100644
index 91b68084..00000000
--- a/debian/taler-merchant.substvars
+++ /dev/null
@@ -1,3 +0,0 @@
-misc:Depends=debconf (>= 0.5) | debconf-2.0
-shlibs:Depends=libc6 (>= 2.14), libgnunet (>= 0.14.1), libjansson4 (>= 2.0.1), 
libltdl7 (>= 2.4.6), libmicrohttpd12 (>= 0.9.50), libqrencode4 (>= 3.2.0), 
libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0), taler-merchant (>= 
0.9.0)
-misc:Pre-Depends=

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