diff -Nru esmtp-1.2/debian/changelog esmtp-1.2/debian/changelog --- esmtp-1.2/debian/changelog 2018-12-28 16:19:54.000000000 +0000 +++ esmtp-1.2/debian/changelog 2021-10-24 13:13:21.000000000 +0000 @@ -1,3 +1,19 @@ +esmtp (1.2-18) unstable; urgency=medium + + * debian/control: Add Build-Depends on pkg-config + * Refresh "Fix libesmtp linking" and use pkg-config (Closes: #997352) + * Update .gitlab-ci.yml based on Salsa CI Team's template + * Add Build-Depends on libssl-dev as workaround for #997697 in libesmtp-dev + * Rename Salsa CI Team's template file to debian/salsa-ci.yml + * Bump Debhelper compat level to 13 + * Declare compliance with Debian policy 4.6.0 + * Update copyright years for debian/* packaging files + * debian/not-installed: Mark mailq, newaliases and sendmail as deliberately + not installed. We make symlinks for those in esmtp-run binary packages. + * debian/copyright: Correct files paths in two copyright stanzas + + -- Salvatore Bonaccorso Sun, 24 Oct 2021 15:13:21 +0200 + esmtp (1.2-17) unstable; urgency=medium * Add an initial Gitlab CI config file diff -Nru esmtp-1.2/debian/control esmtp-1.2/debian/control --- esmtp-1.2/debian/control 2018-12-28 16:19:54.000000000 +0000 +++ esmtp-1.2/debian/control 2021-10-24 13:13:21.000000000 +0000 @@ -4,11 +4,14 @@ Maintainer: Salvatore Bonaccorso Build-Depends: bison, - debhelper-compat (= 12), + debhelper-compat (= 13), flex, libesmtp-dev, +# Workaround for #997697 in libesmtp-dev + libssl-dev, + pkg-config, po-debconf -Standards-Version: 4.3.0 +Standards-Version: 4.6.0 Homepage: http://esmtp.sourceforge.net/ Vcs-Browser: https://salsa.debian.org/carnil/esmtp Vcs-Git: https://salsa.debian.org/carnil/esmtp.git diff -Nru esmtp-1.2/debian/copyright esmtp-1.2/debian/copyright --- esmtp-1.2/debian/copyright 2018-12-28 16:19:54.000000000 +0000 +++ esmtp-1.2/debian/copyright 2021-10-24 13:13:21.000000000 +0000 @@ -31,11 +31,11 @@ . Jose -Files: ./esmtp-wrapper +Files: esmtp-wrapper Copyright: 2007, Phil Sutter License: GPL-2+ -Files: ./esmtp.1 +Files: esmtp.1 Copyright: 2003-2009, José Fonseca License: GPL-2 Comment: File contains further the following note: @@ -50,7 +50,7 @@ .\" The Regents of the University of California. All rights reserved. Files: debian/* -Copyright: 2009-2018, Salvatore Bonaccorso +Copyright: 2009-2021, Salvatore Bonaccorso 2009-2009, José Fonseca License: GPL-2 diff -Nru esmtp-1.2/debian/.gitlab-ci.yml esmtp-1.2/debian/.gitlab-ci.yml --- esmtp-1.2/debian/.gitlab-ci.yml 2018-12-28 16:19:54.000000000 +0000 +++ esmtp-1.2/debian/.gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - -build: - extends: .build-unstable - -reprotest: - extends: .test-reprotest - -lintian: - extends: .test-lintian - -autopkgtest: - extends: .test-autopkgtest - -piuparts: - extends: .test-piuparts diff -Nru esmtp-1.2/debian/not-installed esmtp-1.2/debian/not-installed --- esmtp-1.2/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ esmtp-1.2/debian/not-installed 2021-10-24 13:13:21.000000000 +0000 @@ -0,0 +1,9 @@ +# Those are installed as symlinks into esmtp-run binary package +# Ignore those from dh_missing(1) +usr/bin/mailq +usr/bin/newaliases +usr/lib/*/sendmail +usr/sbin/sendmail +usr/share/man/man1/mailq.1 +usr/share/man/man1/newaliases.1 +usr/share/man/man1/sendmail.1 diff -Nru esmtp-1.2/debian/patches/fix_esmtp_linking.patch esmtp-1.2/debian/patches/fix_esmtp_linking.patch --- esmtp-1.2/debian/patches/fix_esmtp_linking.patch 2018-12-28 16:19:54.000000000 +0000 +++ esmtp-1.2/debian/patches/fix_esmtp_linking.patch 2021-10-24 13:13:21.000000000 +0000 @@ -1,17 +1,31 @@ Description: Fix libesmtp linking - Set LIBS directly to $LIBS -lesmtp without using esmtp-config --libs. + Switch to use pkg-config to detect the right flags $CFLAGS and $LIBS. Origin: vendor Author: Salvatore Bonaccorso -Last-Update: 2014-06-09 +Last-Update: 2021-10-24 --- a/configure.ac +++ b/configure.ac -@@ -34,7 +34,7 @@ if libesmtp-config --version > /dev/null +@@ -8,6 +8,7 @@ AM_INIT_AUTOMAKE(1.11 dist-bzip2) + AM_MAINTAINER_MODE + + AC_PROG_CC ++PKG_PROG_PKG_CONFIG + + AC_HEADER_STDC + +@@ -30,11 +31,11 @@ then + AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])]) + fi + AC_MSG_CHECKING(for libESMTP) +-if libesmtp-config --version > /dev/null 2>&1 ++if $PKG_CONFIG --exists 'libesmtp-1.0' then AC_MSG_RESULT(yes) - CFLAGS="$CFLAGS `libesmtp-config --cflags`" +- CFLAGS="$CFLAGS `libesmtp-config --cflags`" - LIBS="$LIBS `libesmtp-config --libs`" -+ LIBS="$LIBS -lesmtp" ++ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags 'libesmtp-1.0'`" ++ LIBS="$LIBS `$PKG_CONFIG --libs 'libesmtp-1.0'`" else AC_MSG_RESULT(no) AC_MSG_ERROR(libESMTP library not found) diff -Nru esmtp-1.2/debian/salsa-ci.yml esmtp-1.2/debian/salsa-ci.yml --- esmtp-1.2/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ esmtp-1.2/debian/salsa-ci.yml 2021-10-24 13:13:21.000000000 +0000 @@ -0,0 +1,3 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml