From 6a1d3f57c5ecc5a142e63fb574a017f02f207bab Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 21 Jan 2021 17:47:17 +0100 Subject: improve Debian package rules --- debian/libtalermerchant-dev.install | 1 + debian/libtalermerchant.install | 3 +-- debian/libtalermerchant.substvars | 2 +- debian/rules | 2 ++ debian/taler-merchant.install | 6 ++++++ debian/taler-merchant.postrm.debhelper | 2 +- debian/taler-merchant.substvars | 2 +- src/backend/Makefile.am | 3 ++- src/backend/kudos.conf | 16 ++++++++++++++++ src/backend/merchant.conf | 17 ----------------- 10 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 src/backend/kudos.conf diff --git a/debian/libtalermerchant-dev.install b/debian/libtalermerchant-dev.install index 146a6037..dc39ff35 100644 --- a/debian/libtalermerchant-dev.install +++ b/debian/libtalermerchant-dev.install @@ -1,2 +1,3 @@ usr/include usr/lib/*/*.so +usr/lib/*/libtalermerchanttesting.so.* diff --git a/debian/libtalermerchant.install b/debian/libtalermerchant.install index bfd61d62..de3e6159 100644 --- a/debian/libtalermerchant.install +++ b/debian/libtalermerchant.install @@ -1,2 +1 @@ -usr/lib/*/*.so.* -usr/share/ +usr/lib/*/libtalermerchant.so.* diff --git a/debian/libtalermerchant.substvars b/debian/libtalermerchant.substvars index 2aeedff3..82f60a1c 100644 --- a/debian/libtalermerchant.substvars +++ b/debian/libtalermerchant.substvars @@ -1,3 +1,3 @@ -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) +shlibs:Depends=libc6 (>= 2.14), libcurl3-gnutls (>= 7.16.2), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libtalerexchange (>= 0.9.0) misc:Depends= misc:Pre-Depends= diff --git a/debian/rules b/debian/rules index d7979eaa..66d379e4 100755 --- a/debian/rules +++ b/debian/rules @@ -34,4 +34,6 @@ override_dh_auto_clean: # Remove files already present in libtalerexchange from main taler-exchange package override_dh_install: dh_install + cd debian/libtalermerchant-dev; find . -type f -exec rm -f ../taler-merchant/{} \; + cd debian/libtalermerchant-dev; find . -type f -exec rm -f ../libtalermerchant/{} \; cd debian/libtalermerchant; find . -type f -exec rm -f ../taler-merchant/{} \; diff --git a/debian/taler-merchant.install b/debian/taler-merchant.install index 77e2900b..4f32e737 100644 --- a/debian/taler-merchant.install +++ b/debian/taler-merchant.install @@ -1,5 +1,11 @@ usr/bin/ usr/lib/*/taler/*.so +usr/lib/*/libtalermerchantdb.so.* +usr/share/man/man1/* +/usr/share/info/taler-merchant* +/usr/share/taler/merchant/* +/usr/share/taler/sql/merchant/* +/usr/share/taler/config.d/* debian/etc/* /etc/ debian/conf/* etc/taler-merchant/ debian/db/install/* usr/share/dbconfig-common/scripts/taler-merchant/install/ diff --git a/debian/taler-merchant.postrm.debhelper b/debian/taler-merchant.postrm.debhelper index 5d2556c1..d20b4ec4 100644 --- a/debian/taler-merchant.postrm.debhelper +++ b/debian/taler-merchant.postrm.debhelper @@ -1,4 +1,4 @@ -# Automatically added by dh_installdebconf/13.3 +# Automatically added by dh_installdebconf/13.3.1 if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule db_purge diff --git a/debian/taler-merchant.substvars b/debian/taler-merchant.substvars index 3bbad5ad..49a48eaa 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), libqrencode4 (>= 3.2.0), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0) +shlibs:Depends=libc6 (>= 2.14), libgnunet (>= 0.14.0), libjansson4 (>= 2.0.1), libltdl7 (>= 2.4.6), libmicrohttpd12 (>= 0.9.50), libqrencode4 (>= 3.2.0), libtalerexchange (>= 0.9.0), libtalermerchant (>= 0.9.0), libtalermerchant-dev (>= 0.9.0), taler-merchant (>= 0.9.0) misc:Pre-Depends= diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index 10385980..4c05db42 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -9,6 +9,7 @@ endif pkgcfgdir = $(prefix)/share/taler/config.d/ pkgcfg_DATA = \ + kudos.conf \ merchant.conf EXTRA_DIST = \ @@ -117,4 +118,4 @@ taler_merchant_httpd_LDADD = \ $(XLIB) taler_merchant_httpd_CFLAGS = \ @QR_CFLAGS@ \ - $(AM_CFLAGS) + $(AM_CFLAGS) diff --git a/src/backend/kudos.conf b/src/backend/kudos.conf new file mode 100644 index 00000000..377ff899 --- /dev/null +++ b/src/backend/kudos.conf @@ -0,0 +1,16 @@ + + +# Trust Taler project for "KUDOS" currency so that demos work out-of-the-box +[merchant-exchange-kudos] +EXCHANGE_BASE_URL = https://exchange.demo.taler.net/ +MASTER_KEY = FH1Y8ZMHCTPQ0YFSZECDH8C9407JR3YN0MF1706PTG24Q4NEWGV0 +# If currency does not match [TALER] section, the exchange +# will be ignored! +CURRENCY = KUDOS + +[merchant-auditor-kudos] +AUDITOR_BASE_URL = https://auditor.demo.taler.net/ +AUDITOR_KEY = DSDASDXAMDAARMNAD53ZA4AFAHA2QADAMAHHASWDAWXN84SDAA11 +# If currency does not match [TALER] section, the auditor +# will be ignored! +CURRENCY = KUDOS diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 951246c5..1fdc17ea 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -52,20 +52,3 @@ WIRE_TRANSFER_DELAY = 3 week # How fast do we want customers to pay, i.e. how long will our # proposal be valid? DEFAULT_PAY_DEADLINE = 1 day - - - -# Trust Taler project for "KUDOS" currency so that demos work out-of-the-box -[merchant-exchange-kudos] -EXCHANGE_BASE_URL = https://exchange.demo.taler.net/ -MASTER_KEY = FH1Y8ZMHCTPQ0YFSZECDH8C9407JR3YN0MF1706PTG24Q4NEWGV0 -# If currency does not match [TALER] section, the exchange -# will be ignored! -CURRENCY = KUDOS - -[merchant-auditor-kudos] -AUDITOR_BASE_URL = https://auditor.demo.taler.net/ -AUDITOR_KEY = DSDASDXAMDAARMNAD53ZA4AFAHA2QADAMAHHASWDAWXN84SDAA11 -# If currency does not match [TALER] section, the auditor -# will be ignored! -CURRENCY = KUDOS -- cgit v1.2.3