Control: tags 1017137 + patch
Control: tags 1017137 + pending
Dear maintainer,
I've prepared an NMU for newsboat (versioned as 2.21-1.4) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru newsboat-2.21/debian/changelog newsboat-2.21/debian/changelog
--- newsboat-2.21/debian/changelog 2022-07-16 22:13:03.000000000 +0300
+++ newsboat-2.21/debian/changelog 2022-09-13 22:56:30.000000000 +0300
@@ -1,3 +1,11 @@
+newsboat (2.21-1.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Use the packaged catch.hpp and json.hpp instead of vendored copies.
+ (Closes: #1017137)
+
+ -- Adrian Bunk <b...@debian.org> Tue, 13 Sep 2022 22:56:30 +0300
+
newsboat (2.21-1.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru newsboat-2.21/debian/clean newsboat-2.21/debian/clean
--- newsboat-2.21/debian/clean 1970-01-01 02:00:00.000000000 +0200
+++ newsboat-2.21/debian/clean 2022-09-13 22:56:30.000000000 +0300
@@ -0,0 +1,2 @@
+3rd-party/catch.hpp
+3rd-party/json.hpp
diff -Nru newsboat-2.21/debian/control newsboat-2.21/debian/control
--- newsboat-2.21/debian/control 2022-06-23 19:47:20.000000000 +0300
+++ newsboat-2.21/debian/control 2022-09-13 22:56:30.000000000 +0300
@@ -11,6 +11,8 @@
pkg-config,
libcurl4-gnutls-dev,
libjson-c-dev,
+ catch2,
+ nlohmann-json3-dev,
asciidoctor,
cargo,
librust-chrono-0.4-dev,
diff -Nru newsboat-2.21/debian/rules newsboat-2.21/debian/rules
--- newsboat-2.21/debian/rules 2020-10-15 16:34:06.000000000 +0300
+++ newsboat-2.21/debian/rules 2022-09-13 22:56:30.000000000 +0300
@@ -13,6 +13,8 @@
override_dh_auto_build:
rm -f Cargo.lock
+ ln -fs /usr/include/catch2/catch.hpp 3rd-party/
+ ln -fs /usr/include/nlohmann/json.hpp 3rd-party/
dh_auto_build -- CARGO_HOME=debian/cargo_home prefix=/usr all
make doc
