Package: purple-lurch
Version: 0.7.0-2
Severity: normal
Tags: patch  pending

[Replace XX with correct value]

Dear maintainer,

I've prepared an NMU for purple-lurch (versioned as 0.7.0-2.1) and
uploaded it to sid.

Regards.

-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru purple-lurch-0.7.0/debian/changelog purple-lurch-0.7.0/debian/changelog
--- purple-lurch-0.7.0/debian/changelog	2023-07-13 11:30:41.000000000 +0200
+++ purple-lurch-0.7.0/debian/changelog	2024-07-09 14:27:06.000000000 +0200
@@ -1,3 +1,11 @@
+purple-lurch (0.7.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add missing prototype to fix ftbfs. Closes: #1066710
+  * Use pkg-config to locate libgcrypt. Closes: #1071952
+
+ -- Andreas Metzler <ametz...@debian.org>  Tue, 09 Jul 2024 14:27:06 +0200
+
 purple-lurch (0.7.0-2) unstable; urgency=medium
 
   [ Debian Janitor ]
diff -Nru purple-lurch-0.7.0/debian/patches/add_missing_prototype.diff purple-lurch-0.7.0/debian/patches/add_missing_prototype.diff
--- purple-lurch-0.7.0/debian/patches/add_missing_prototype.diff	1970-01-01 01:00:00.000000000 +0100
+++ purple-lurch-0.7.0/debian/patches/add_missing_prototype.diff	2024-07-09 14:09:04.000000000 +0200
@@ -0,0 +1,47 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ purple-lurch (0.7.0-2.1) UNRELEASED; urgency=medium
+ .
+   * Non-maintainer upload.
+   * Add missing prototype to fix ftbfs. Closes: #1066710
+Author: Andreas Metzler <ametz...@debian.org>
+Bug-Debian: https://bugs.debian.org/1066710
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
+Bug: <upstream-bugtracker-url>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: (no|not-needed|<patch-forwarded-url>)
+Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
+Reviewed-By: <name and email of someone who approved/reviewed the patch>
+Last-Update: 2024-07-09
+
+--- purple-lurch-0.7.0.orig/test/test_lurch_util.c
++++ purple-lurch-0.7.0/test/test_lurch_util.c
+@@ -9,6 +9,9 @@
+ #include "../src/lurch.h"
+ #include "../src/lurch_util.h"
+ 
++/* declared in src/lurch_util.c */
++extern void lurch_util_axc_log_func(int level, const char * msg, size_t len, void * user_data);
++
+ void __wrap_purple_debug_error(const char * category, const char * format, ...) {
+     function_called();
+ }
+@@ -213,4 +216,4 @@ int main(void) {
+     };
+ 
+     return cmocka_run_group_tests_name("lurch_util", tests, NULL, NULL);
+-}
+\ No newline at end of file
++}
diff -Nru purple-lurch-0.7.0/debian/patches/libgcrypt-pkgconfig.diff purple-lurch-0.7.0/debian/patches/libgcrypt-pkgconfig.diff
--- purple-lurch-0.7.0/debian/patches/libgcrypt-pkgconfig.diff	1970-01-01 01:00:00.000000000 +0100
+++ purple-lurch-0.7.0/debian/patches/libgcrypt-pkgconfig.diff	2024-07-09 14:09:04.000000000 +0200
@@ -0,0 +1,32 @@
+Description: Use pkg-config to locate libgcrypt
+Author: Andreas Metzler <ametz...@debian.org>
+Bug-Debian: https://bugs.debian.org/1071952
+Last-Update: 2024-07-09
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,11 +2,10 @@
+ #
+ CC ?= gcc
+ 
+ PKG_CONFIG ?= pkg-config
+ XML2_CONFIG ?= xml2-config
+-LIBGCRYPT_CONFIG ?= libgcrypt-config
+ 
+ MKDIR = mkdir
+ MKDIR_P = mkdir -p
+ INSTALL = install
+ INSTALL_LIB = $(INSTALL) -m 755
+@@ -36,11 +35,11 @@ LIBSIGNAL_PROTOCOL_CFLAGS = $(shell $(PK
+ LIBSIGNAL_PROTOCOL_LDFLAGS = $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
+ 
+ XML2_CFLAGS ?= $(shell $(XML2_CONFIG) --cflags)
+ XML2_LDFLAGS ?= $(shell $(XML2_CONFIG) --libs)
+ 
+-LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)
++LIBGCRYPT_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs libgcrypt)
+ 
+ USE_DYNAMIC_LIBS=libsignal-protocol-c libaxc libomemo
+ USE_DYNAMIC_LIBS:=$(shell pkg-config --exists $(USE_DYNAMIC_LIBS) && \
+ 	echo '$(USE_DYNAMIC_LIBS)')
+ 
diff -Nru purple-lurch-0.7.0/debian/patches/series purple-lurch-0.7.0/debian/patches/series
--- purple-lurch-0.7.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ purple-lurch-0.7.0/debian/patches/series	2024-07-09 14:09:04.000000000 +0200
@@ -0,0 +1,2 @@
+add_missing_prototype.diff
+libgcrypt-pkgconfig.diff

Attachment: signature.asc
Description: PGP signature

Reply via email to