Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu

Dear team,

[ Reason ]
This is a regression. The upstream released the 1.7.1 version and a day after,
he made a commit to fix the issue[1]. This pu is fully based in the last
upstream commit. The previous version 1.7.0 worked fine in Sid and was
replaced by 1.7.1.

[1] 
https://github.com/mvertes/txt2man/commit/be89fb412fd443813db6b4d2fcd4223546138757

txt2man is used to create manpages from an ASCII text following some format
rules. To generate a literal block, each line must be preceded by a TAB. In
1.7.1 version, the literal block is being generated as a normal paragraph.
Consequently, the original format is arbitrary changed by txt2man.

This upload is related to bug #992283 and I discovered this issue today.

[ Impact ]
If not approved, the user will not be able to create a manpage with literal
blocks, useful to display source codes, tables, etc.

[ Tests ]
New CI tests were introduced in the package sent to Sid to verify and avoid
future regressions.

[ Risks ]
This is a trivial fix, no risks.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
A patch (quilt) was created to modify two lines in the final executable. This
executable (txt2man) is a shell script.

[ Other info ]
None.

Thanks in advance.

Regards,

Eriberto
diff -Nru txt2man-1.7.1/debian/changelog txt2man-1.7.1/debian/changelog
--- txt2man-1.7.1/debian/changelog      2020-06-28 23:09:08.000000000 -0300
+++ txt2man-1.7.1/debian/changelog      2021-08-16 17:21:58.000000000 -0300
@@ -1,3 +1,12 @@
+txt2man (1.7.1-1+deb11u1) bullseye; urgency=medium
+
+  * debian/patches/020_fix-display-blocks.patch: created to fix regression in
+    handling display blocks. Currently, literal blocks are being treated as
+    paragraphs. Consequently, is not possible put a source code or a literal
+    text in a manpage. (Closes: #992283)
+
+ -- Joao Eriberto Mota Filho <eribe...@debian.org>  Mon, 16 Aug 2021 17:21:58 
-0300
+
 txt2man (1.7.1-1) unstable; urgency=medium
 
   * New upstream version 1.7.1.
diff -Nru txt2man-1.7.1/debian/patches/020_fix-display-blocks.patch 
txt2man-1.7.1/debian/patches/020_fix-display-blocks.patch
--- txt2man-1.7.1/debian/patches/020_fix-display-blocks.patch   1969-12-31 
21:00:00.000000000 -0300
+++ txt2man-1.7.1/debian/patches/020_fix-display-blocks.patch   2021-08-16 
17:21:58.000000000 -0300
@@ -0,0 +1,30 @@
+Description: fix regression in handling display blocks
+             Literal blocks are started by a 'tab' per line.
+Author: Marc Vertes <mver...@free.fr>
+Origin: 
https://github.com/mvertes/txt2man/commit/be89fb412fd443813db6b4d2fcd4223546138757
+Bug-Debian: https://bugs.debian.org/992283
+Forwarded: not-needed
+Reviewed-By: Joao Eriberto Mota Filho <eribe...@debian.org>
+Last-Update: 2021-08-16
+Index: txt2man/txt2man
+===================================================================
+--- txt2man.orig/txt2man
++++ txt2man/txt2man
+@@ -153,7 +153,7 @@ do
+       (I) itxt="$OPTARGĀ§$itxt";;
+       (B) btxt="$OPTARGĀ§$btxt";;
+       (T) post="groff -mandoc -Tlatin1 | ${PAGER:-pager}";;
+-      (X) post="groff -mandoc -X -P-resolution -P100";;
++      (X) post="groff -mandoc -TX100-12 -rS12";;
+       (*) usage; exit;;
+       esac
+ done
+@@ -214,7 +214,7 @@ BEGIN {
+       # remove spaces in empty lines
+       sub(/^ +$/,"")
+ }
+-/^[[:upper:][:space:][:digit:][:punct:]]+$/ {
++/^[:space:]*[[:upper:][:digit:]]+[[:upper:][:space:][:digit:][:punct:]]+$/ {
+       # Section header
+       if ((in_bd + 0) == 1) {
+               in_bd = 0
diff -Nru txt2man-1.7.1/debian/patches/series 
txt2man-1.7.1/debian/patches/series
--- txt2man-1.7.1/debian/patches/series 2020-06-28 23:09:08.000000000 -0300
+++ txt2man-1.7.1/debian/patches/series 2021-08-16 17:21:58.000000000 -0300
@@ -1 +1,2 @@
 010_fix-pager-option.patch
+020_fix-display-blocks.patch

Reply via email to