summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-07-14 13:17:11 +0200
committerChristian Grothoff <christian@grothoff.org>2021-07-14 13:17:11 +0200
commitd58edf5244ae616ef5e7f549c51ba67fb2aeb1b1 (patch)
treec4b5e68a9f016d9321c004dc983044fc667815fb /debian
parentde7e324e4bda4e363ec9bc35159418a7283fc6da (diff)
downloadmerchant-d58edf5244ae616ef5e7f549c51ba67fb2aeb1b1.tar.gz
merchant-d58edf5244ae616ef5e7f549c51ba67fb2aeb1b1.tar.bz2
merchant-d58edf5244ae616ef5e7f549c51ba67fb2aeb1b1.zip
allow 'or'
Diffstat (limited to 'debian')
-rw-r--r--debian/control2
-rw-r--r--debian/libtalermerchant.substvars3
-rw-r--r--debian/taler-merchant.postrm.debhelper6
-rw-r--r--debian/taler-merchant.substvars3
4 files changed, 1 insertions, 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=