-update Debian package: include expire service, update dependencies

5 files changed, 30 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 8dcaf12d4..9e50e9dbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-exchange (0.9.0) unstable; urgency=low
+
+  * Updating to latest pre-release from Git.
+
+ -- Christian Grothoff <grothoff@taler.net>  Mon, 20 Jun 2022 13:12:58 +0200
+
 taler-exchange (0.8.5-3) unstable; urgency=low
 
   * Updating to latest Git with minor bugfixes and improvements.
diff --git a/debian/control b/debian/control
index 894a1dd37..2adf6f0a5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,27 +9,22 @@ Build-Depends:
  bash,
  debhelper-compat (= 12),
  gettext,
- libgnunet-dev (>=0.15.3),
+ libgnunet-dev (>=0.17.0),
  libcurl4-gnutls-dev (>=7.35.0) | libcurl4-openssl-dev (>= 7.35.0),
- libgcrypt20-dev (>=1.6),
+ libgcrypt20-dev (>=1.8),
  libgnutls28-dev (>=3.2.12),
  libidn2-dev,
  libjansson-dev,
  libltdl-dev (>=2.2),
- libmicrohttpd-dev (>=0.9.63),
- libpq-dev (>=9.5),
+ libmicrohttpd-dev (>=0.9.71),
+ libpq-dev (>=13),
  libsodium-dev (>=1.0.11),
- libsqlite3-dev (>=3.8),
  libunistring-dev (>=0.9.2),
  python3-jinja2,
- net-tools,
  po-debconf,
  python3-dev,
  texinfo (>=5.2),
  zlib1g-dev
-Build-Conflicts:
- autoconf2.13,
- automake1.4
 Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/debian/taler-exchange.git
 Vcs-browser: https://salsa.debian.org/debian/taler-exchange
@@ -109,9 +104,9 @@ Section: libdevel
 Architecture: any
 Depends:
  libtalerexchange (= ${binary:Version}),
- libgnunet-dev (>=0.15.3),
- libgcrypt20-dev (>=1.6),
- libmicrohttpd-dev (>=0.9.33),
+ libgnunet-dev (>=0.17.0),
+ libgcrypt20-dev (>=1.8),
+ libmicrohttpd-dev (>=0.9.71),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: libraries to talk to a GNU Taler exchange (development)
diff --git a/debian/rules b/debian/rules
index 13d556472..d88ca73fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ override_dh_installsystemd:
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-aggregator --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-transfer --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-wirewatch --no-start --no-enable
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-cs --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-eddsa --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-rsa --no-start --no-enable
 	dh_installsystemd -ptaler-exchange --name=taler-exchange-closer --no-start --no-enable
diff --git a/debian/taler-exchange.taler-exchange-expire.service b/debian/taler-exchange.taler-exchange-expire.service
new file mode 100644
index 000000000..f44829c5e
--- /dev/null
+++ b/debian/taler-exchange.taler-exchange-expire.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=GNU Taler payment system exchange expire service
+PartOf=taler-exchange.target
+
+[Service]
+User=taler-exchange-expire
+Type=simple
+Restart=always
+RestartSec=100ms
+ExecStart=/usr/bin/taler-exchange-expire -c /etc/taler/taler.conf
+StandardOutput=journal
+StandardError=journal
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectSystem=full
diff --git a/debian/taler-exchange.taler-exchange.target b/debian/taler-exchange.taler-exchange.target
index eea37c800..65ec77c1e 100644
--- a/debian/taler-exchange.taler-exchange.target
+++ b/debian/taler-exchange.taler-exchange.target
@@ -6,6 +6,7 @@ Wants=taler-exchange-httpd.service
 Wants=taler-exchange-wirewatch.service
 Wants=taler-exchange-aggregator.service
 Wants=taler-exchange-closer.service
+Wants=taler-exchange-expire.service
 Wants=taler-exchange-transfer.service
 
 [Install]