From 85b2ee0803f2254e821fa9411aa240049bed9607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Wed, 25 Sep 2024 14:46:31 +0200 Subject: [PATCH] Revert "dbld: disable smtp on debian-testing" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 55c821f39e06e27dce9d9059a97129cb59d3cdc3. Signed-off-by: László Várady --- dbld/build.manifest | 2 +- packaging/debian/control | 2 +- packaging/debian/rules | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dbld/build.manifest b/dbld/build.manifest index 3690028fd0..0fdbbc1e18 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -30,7 +30,7 @@ # libcriterion-dev is available starting with bullseye debian-bullseye python3,nojava,notzdatalegacy,nobpf debian-bookworm python3,nojava,notzdatalegacy -debian-testing python3,nojava,nosmtp +debian-testing python3,nojava debian-sid python3,nojava # on ubuntu, we start using Python3 at focal onwards. diff --git a/packaging/debian/control b/packaging/debian/control index 497f8e6a46..29a42fd403 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10~), pkg-config, flex, bison (>= 3.4.2), gperf, libcriterion-dev , xsltproc, docbook-xsl, - libesmtp-dev , + libesmtp-dev, libivykis-dev (>= 0.36.1~), libnet1-dev, libglib2.0-dev, diff --git a/packaging/debian/rules b/packaging/debian/rules index afdbe27cd6..b2b6bd0726 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -64,10 +64,6 @@ endif PYTHON_VERSION = 3 -ifneq ($(filter sng-nosmtp,$(DEB_BUILD_PROFILES)),) -DH_OPTIONS += -Naxosyslog-mod-smtp -endif - ifneq ($(filter sng-nokafka,$(DEB_BUILD_PROFILES)),) DH_OPTIONS += -Naxosyslog-mod-rdkafka endif