Hi! I'm attaching a patch, based on the Salsa HEAD at 82d10d0, to do just that.
The package builds with src/json.[ch] removed, too. Could probably be an uscan exclusion rule, but I didn't want to touch the legacy d/copyright. Best, наб
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: libc6 (>= [-2.29)-] {+2.27), libjsonparser1.1 (>= 1.1.0)+}
Installed-Size: [-515-] {+507+}
From 2ab04febc4618de2517a0b1ccda28f7cb2804357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@gmail.com> Date: Tue, 12 May 2020 03:20:32 +0200 Subject: [PATCH] Add patch and Build-Depends to use system libjsonparser Closes: #958256 --- debian/control | 2 +- debian/patches/series | 1 + debian/patches/use-system-libjsonparser.diff | 49 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 debian/patches/use-system-libjsonparser.diff diff --git a/debian/control b/debian/control index 172edb7..b05ed20 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: remind Section: utils Priority: optional Maintainer: Ana Beatriz Guerrero Lopez <a...@debian.org> -Build-Depends: debhelper (>= 10), cdbs +Build-Depends: debhelper (>= 10), cdbs, libjsonparser-dev Standards-Version: 4.5.0 Homepage: https://dianne.skoll.ca/projects/remind/ Vcs-Git: https://salsa.debian.org/debian/remind.git diff --git a/debian/patches/series b/debian/patches/series index 6d8f97d..352cc12 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ do-not-strip.diff +use-system-libjsonparser.diff diff --git a/debian/patches/use-system-libjsonparser.diff b/debian/patches/use-system-libjsonparser.diff new file mode 100644 index 0000000..b0c9efb --- /dev/null +++ b/debian/patches/use-system-libjsonparser.diff @@ -0,0 +1,49 @@ +From: наб <nabijaczlew...@gmail.com> +Date: Tue, 12 May 2020 03:14:11 +0200 +Subject: Use system libjsonparser + +--- + src/Makefile.in | 6 +++--- + src/rem2ps.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index fb24a2c..b895e9c 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -45,8 +45,8 @@ test: remind + + $(REMINDOBJS): $(REMINDHDRS) + +-rem2ps: rem2ps.o dynbuf.o json.o +- @CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o json.o -lm ++rem2ps: rem2ps.o dynbuf.o ++ @CC@ @LDFLAGS@ $(LDEXTRA) -o rem2ps rem2ps.o dynbuf.o -ljsonparser -lm + + remind: $(REMINDOBJS) + @CC@ @LDFLAGS@ $(LDEXTRA) -o remind $(REMINDOBJS) @LIBS@ +@@ -74,7 +74,7 @@ clobber: + rm -f *.o *~ remind rem2ps test.out core *.bak + + depend: +- gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c json.c ++ gccmakedep @DEFS@ $(REMINDSRCS) rem2ps.c + + # The next targets are not very useful to you. I use them to build + # distributions, etc. +diff --git a/src/rem2ps.c b/src/rem2ps.c +index a32af96..2646fd0 100644 +--- a/src/rem2ps.c ++++ b/src/rem2ps.c +@@ -20,7 +20,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include "rem2ps.h" +-#include "json.h" ++#include "json-parser/json.h" + + #define NEW(type) (malloc(sizeof(type))) + +-- +2.20.1 + -- 2.20.1
signature.asc
Description: PGP signature
