Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
Please unblock astroidmail 0.14-2.1. This upload fixes the RC bug
https://bugs.debian.org/924818 , which is caused by the compatibility
issue between this software and the newer ronn 0.8.x introduced in the
Buster cycle. The solution is to use the alternative tool (scdoc) as
preferred by upstream to generate the man page. A patch onto
CMakeLists.txt is also applied to fix the ronn compatibility issue
itself.
--
Thanks,
Boyuan Yang
Full source diff is also provided here:
diff -Nru astroidmail-0.14/debian/changelog astroidmail-
0.14/debian/changelog
--- astroidmail-0.14/debian/changelog 2018-11-30 15:54:19.000000000
-0500
+++ astroidmail-0.14/debian/changelog 2019-04-04 19:03:52.000000000
-0400
@@ -1,3 +1,13 @@
+astroidmail (0.14-2.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * debian/patches: Add a patch to fix compatibility with
+ newer ronn and solve the FTBFS. (Closes: #924818)
+ * debian/control: Add build-dependency on scdoc in order to
+ generate man pages with higher quality.
+
+ -- Boyuan Yang <byang@debian.org> Thu, 04 Apr 2019 19:03:52 -0400
+
astroidmail (0.14-2) unstable; urgency=medium
* Add patch cherry-picked upstream
diff -Nru astroidmail-0.14/debian/control astroidmail-
0.14/debian/control
--- astroidmail-0.14/debian/control 2018-10-01 04:27:05.000000000
-0400
+++ astroidmail-0.14/debian/control 2019-04-04 19:03:50.000000000
-0400
@@ -28,6 +28,7 @@
pkg-config,
protobuf-compiler,
python3-gi,
+ scdoc,
ronn,
xauth,
xvfb,
diff -Nru astroidmail-0.14/debian/patches/1002-CMakeLists.txt-Update-
ronn-parameters-for-compat-wit.patch astroidmail-
0.14/debian/patches/1002-CMakeLists.txt-Update-ronn-parameters-for-
compat-wit.patch
--- astroidmail-0.14/debian/patches/1002-CMakeLists.txt-Update-ronn-
parameters-for-compat-wit.patch 1969-12-31 19:00:00.000000000 -0500
+++ astroidmail-0.14/debian/patches/1002-CMakeLists.txt-Update-ronn-
parameters-for-compat-wit.patch 2019-04-04 19:01:03.000000000 -0400
@@ -0,0 +1,25 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Thu, 4 Apr 2019 18:44:22 -0400
+Subject: CMakeLists.txt: Update ronn parameters for compat with new
ronn
+
+The newer versions of ronn no longer accepts the -p option.
+Using the long option ("--pipe") instead.
+
+Forwarded: https://github.com/astroidmail/astroid/issues/627
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99b38e4..d1de553 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -410,7 +410,7 @@ if (NOT DISABLE_DOCS)
+ message (WARNING "Falling back to 'ronn' for man page
generation.")
+ add_custom_command (
+ TARGET astroid
+- COMMAND ${RONN} -rp ${CMAKE_SOURCE_DIR}/doc/astroid.1.scd |
gzip > ${CMAKE_BINARY_DIR}/astroid.1.gz
++ COMMAND ${RONN} -r --pipe
${CMAKE_SOURCE_DIR}/doc/astroid.1.scd | gzip >
${CMAKE_BINARY_DIR}/astroid.1.gz
+ COMMENT "Generating man page (ronn)")
+ else ()
+ message (FATAL_ERROR "Neither 'scdoc' nor 'ronn' installed. One
is required for man page generation.")
diff -Nru astroidmail-0.14/debian/patches/series astroidmail-
0.14/debian/patches/series
--- astroidmail-0.14/debian/patches/series 2018-11-30
15:50:50.000000000 -0500
+++ astroidmail-0.14/debian/patches/series 2019-04-04
18:50:50.000000000 -0400
@@ -1 +1,2 @@
020181123~83c03f4.patch
+1002-CMakeLists.txt-Update-ronn-parameters-for-compat-wit.patch
Attachment:
signature.asc
Description: This is a digitally signed message part