Control: tags 1070904 + patch Control: tags 1070904 + pending
Dear maintainer, I've prepared an NMU for bitlbee (versioned as 3.6-1.5) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. Jochen
diff -Nru bitlbee-3.6/debian/changelog bitlbee-3.6/debian/changelog --- bitlbee-3.6/debian/changelog 2024-03-23 22:05:25.000000000 +0100 +++ bitlbee-3.6/debian/changelog 2025-02-14 08:20:44.000000000 +0100 @@ -1,3 +1,10 @@ +bitlbee (3.6-1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Replace libgcrypt-configure with pkg-config (Closes: #1070904) + + -- Jochen Sprickerhof <jspri...@debian.org> Fri, 14 Feb 2025 08:20:44 +0100 + bitlbee (3.6-1.4) unstable; urgency=medium * Non-maintainer upload. diff -Nru bitlbee-3.6/debian/patches/replace-libgcrypt-configure-with-pkg-con.patch bitlbee-3.6/debian/patches/replace-libgcrypt-configure-with-pkg-con.patch --- bitlbee-3.6/debian/patches/replace-libgcrypt-configure-with-pkg-con.patch 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-3.6/debian/patches/replace-libgcrypt-configure-with-pkg-con.patch 2025-02-14 08:20:44.000000000 +0100 @@ -0,0 +1,58 @@ +From: matt <matt@mattthink.localdomain> +Date: Tue, 2 Jul 2024 15:39:46 +0100 +X-Dgit-Generated: 3.6-1.5 2442a31754de56d24e3cadafc7121f07b65c3350 +Subject: Replace libgcrypt-configure with pkg-config + +libgcrypt-configure has been dropped in favour of pkg-config in the +latest releases. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070905 + +--- + +diff --git a/configure b/configure +index fd8d363a..3be785a1 100755 +--- a/configure ++++ b/configure +@@ -402,8 +402,8 @@ detect_gnutls() + { + if $PKG_CONFIG --exists gnutls; then + cat <<EOF >>Makefile.settings +-EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs) +-CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags) ++EFLAGS+=$($PKG_CONFIG --libs gnutls) $(pkg-config --libs libgcrypt) ++CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(pkg-config --cflags libgcrypt) + EOF + ssl=gnutls + if ! $PKG_CONFIG gnutls --atleast-version=2.8; then +@@ -413,8 +413,8 @@ EOF + ret=1 + elif libgnutls-config --version > /dev/null 2> /dev/null; then + cat <<EOF >>Makefile.settings +-EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs) +-CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags) ++EFLAGS+=$(libgnutls-config --libs) $(pkg-config --libs libgcrypt) ++CFLAGS+=$(libgnutls-config --cflags) $(pkg-config --cflags libgcrypt) + EOF + + ssl=gnutls +@@ -762,15 +762,15 @@ fi + if [ "$otr" = 1 ]; then + # BI == built-in + echo '#define OTR_BI' >> config.h +- echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings +- echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings ++ echo "EFLAGS+=$($PKG_CONFIG --libs libotr) $(pkg-config --libs)" >> Makefile.settings ++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config --cflags)" >> Makefile.settings + echo 'OTR_BI=otr.o' >> Makefile.settings + elif [ "$otr" = "plugin" ]; then + # for some mysterious reason beyond the comprehension of my mortal mind, + # the libgcrypt flags aren't needed when building as plugin. add them anyway. + echo '#define OTR_PI' >> config.h +- echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(libgcrypt-config --libs)" >> Makefile.settings +- echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(libgcrypt-config --cflags)" >> Makefile.settings ++ echo "OTRFLAGS=$($PKG_CONFIG --libs libotr) $(pkg-config --libs)" >> Makefile.settings ++ echo "CFLAGS+=$($PKG_CONFIG --cflags libotr) $(pkg-config --cflags)" >> Makefile.settings + echo 'OTR_PI=otr.so' >> Makefile.settings + fi + diff -Nru bitlbee-3.6/debian/patches/series bitlbee-3.6/debian/patches/series --- bitlbee-3.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ bitlbee-3.6/debian/patches/series 2025-02-14 08:20:44.000000000 +0100 @@ -0,0 +1 @@ +replace-libgcrypt-configure-with-pkg-con.patch
signature.asc
Description: PGP signature
