-fix misc package build issues

5 files changed, 19 insertions, 22 deletions

diff --git a/debian/control b/debian/control
index fd6dfc158..cf99dd1ed 100644
--- a/debian/control
+++ b/debian/control
@@ -54,8 +54,7 @@ Depends:
  pandoc,
  groff,
  ghostscript,
- ${misc:Depends},
- ${shlibs:Depends}
+ ${misc:Depends}
 Description: Tool to generate the terms of service
   and privacy policy for various languages and data
   formats. Useful for various GNU Taler components.
diff --git a/debian/rules b/debian/rules
index 155cbda20..890232d45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,21 +36,19 @@ override_dh_auto_clean:
 override_dh_installsystemd:
 	# Need to specify units manually, since we have multiple
 	# and dh_installsystemd by default only looks for "<package>.service".
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-httpd.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-aggregator.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-expire.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-transfer.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-wirewatch.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-cs.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-eddsa.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-rsa.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange-closer.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange.target --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange --name=taler-exchange.slice --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-auditor --name=taler-auditor-httpd.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-auditor --name=taler-helper-auditor-deposits.service --no-start --no-enable --no-stop-on-upgrade
-	dh_installsystemd -ptaler-exchange-offline --name=taler-exchange-offline.service --no-start --no-enable
-	dh_installsystemd -ptaler-exchange-offline --name=taler-exchange-offline.timer --no-start --no-enable
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-httpd --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-aggregator --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-expire --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-transfer --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-wirewatch --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-cs --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-eddsa --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-secmod-rsa --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange-closer --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange --name=taler-exchange --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-auditor --name=taler-auditor-httpd --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-auditor --name=taler-helper-auditor-deposits --no-start --no-enable --no-stop-on-upgrade
+	dh_installsystemd -ptaler-exchange-offline --name=taler-exchange-offline --no-start --no-enable
 	# final invocation to generate daemon reload
 	dh_installsystemd
 
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index b849db5d8..a292dcece 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -51,7 +51,7 @@ libtalerbank_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
   $(XLIB)
 
 libtalerfakebank_la_LDFLAGS = \
@@ -94,7 +94,7 @@ libtalerfakebank_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
   -lmicrohttpd \
   -lpthread \
   $(XLIB)
diff --git a/src/curl/Makefile.am b/src/curl/Makefile.am
index f60a3806d..c8f8761aa 100644
--- a/src/curl/Makefile.am
+++ b/src/curl/Makefile.am
@@ -17,7 +17,7 @@ libtalercurl_la_SOURCES = \
 libtalercurl_la_LIBADD = \
   -lgnunetcurl \
   -lgnunetutil \
-  $(LIBGNURLCURL_LIBS) \
+  -lcurl \
   -ljansson \
   -lz \
   -lm \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0afbc1361..63dab7c80 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -87,8 +87,8 @@ libtalerexchange_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
+  -lcurl \
   -lm \
-  $(LIBGNURLCURL_LIBS) \
   $(XLIB)
 
 libtalerauditor_la_LDFLAGS = \
@@ -106,8 +106,8 @@ libtalerauditor_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
+  -lcurl \
   -lm \
-  $(LIBGNURLCURL_LIBS) \
   $(XLIB)