diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-01-01 21:54:02 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-01-01 21:54:02 +0100 |
| commit | a0a8f482fb69d6fc79e13f3fba302fc7ff964a3f (patch) | |
| tree | 5d5a9b132277db3eb85af8777410dfeeb09d6813 /debian | |
| parent | d2b1596bbd6a56cdc57a65764e051179108313d5 (diff) | |
| download | merchant-a0a8f482fb69d6fc79e13f3fba302fc7ff964a3f.tar.gz merchant-a0a8f482fb69d6fc79e13f3fba302fc7ff964a3f.tar.bz2 merchant-a0a8f482fb69d6fc79e13f3fba302fc7ff964a3f.zip | |
fix linker issues
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/libtalermerchant.substvars | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | debian/taler-merchant.postrm | 1 | ||||
| -rw-r--r-- | debian/taler-merchant.substvars | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/debian/libtalermerchant.substvars b/debian/libtalermerchant.substvars index 4d876ce7..2aeedff3 100644 --- a/debian/libtalermerchant.substvars +++ b/debian/libtalermerchant.substvars @@ -1,3 +1,3 @@ -shlibs:Depends=libc6 (>= 2.29), libcurl3-gnutls (>= 7.35.0), libgcrypt20 (>= 1.8.0), libgnunet (>= 0.14.0), libjansson4 (>= 2.3), libmicrohttpd12 (>= 0.9.50), libpq5, libsqlite3-0 (>= 3.5.9), libtalerexchange (>= 0.9.0), zlib1g (>= 1:1.2.0) +shlibs:Depends=libc6 (>= 2.14), libcurl3-gnutls (>= 7.16.2), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libltdl7 (>= 2.4.6), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0) misc:Depends= misc:Pre-Depends= diff --git a/debian/rules b/debian/rules index 5c32fe88..d7979eaa 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,8 @@ override_dh_auto_install-arch: # Removing useless files rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/taler/*.la \ - debian/tmp/usr/share/doc/taler/COPYING + debian/tmp/usr/share/doc/taler/COPYING \ + debian/tmp/usr/lib/x86_64-linux-gnu/libmustach.a override_dh_auto_install-indep: @@ -33,4 +34,4 @@ override_dh_auto_clean: # Remove files already present in libtalerexchange from main taler-exchange package override_dh_install: dh_install - cd debian/libtalerexchange; find . -type f -exec rm -f ../taler-exchange/{} \; + cd debian/libtalermerchant; find . -type f -exec rm -f ../taler-merchant/{} \; diff --git a/debian/taler-merchant.postrm b/debian/taler-merchant.postrm index 2cf6a941..3cf433e1 100644 --- a/debian/taler-merchant.postrm +++ b/debian/taler-merchant.postrm @@ -41,6 +41,7 @@ fi if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule db_version 2.0 db_get taler-merchant/reconfigure-webserver webservers="$RET" diff --git a/debian/taler-merchant.substvars b/debian/taler-merchant.substvars index ff879441..3bbad5ad 100644 --- a/debian/taler-merchant.substvars +++ b/debian/taler-merchant.substvars @@ -1,3 +1,3 @@ misc:Depends=debconf (>= 0.5) | debconf-2.0 -shlibs:Depends=libc6 (>= 2.14), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libmicrohttpd12 (>= 0.9.50), libtalerexchange (>= 0.9.0) +shlibs:Depends=libc6 (>= 2.14), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libmicrohttpd12 (>= 0.9.50), libqrencode4 (>= 3.2.0), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0) misc:Pre-Depends= |