Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: G. Branden Robinson <g.branden.robin...@gmail.com>
Please unblock package groff. [ Reason ] This upload, made before the full freeze but not quite in time to land in testing before that, was in anticipation of documents being written during the lifetime of bookworm that use new features of groff 1.23. groff 1.23 itself will be too late for bookworm, but the added trivial implementations of .MR and .cp will avoid some bad formatting consequences (especially .MR, which would otherwise cause formatted text not to be rendered at all). [ Impact ] Relatively minimal impact immediately, but as later updates are landed in bookworm it's easy to foresee us ending up with misformatted man pages. [ Tests ] No automatic tests. I've eyeballed some common man pages to ensure they're still rendered reasonably. [ Risks ] Key package, and understanding the code does require an understanding of *roff which is esoteric knowledge these days. However, it's essentially defining two new names (one macro, one "register" or variable), which is pretty harmless. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [ ] attach debdiff against the package in testing unblock groff/1.22.4-10 Thanks, -- Colin Watson (he/him) [cjwat...@debian.org]
diff -Nru groff-1.22.4/debian/.git-dpm groff-1.22.4/debian/.git-dpm --- groff-1.22.4/debian/.git-dpm 2022-11-15 15:30:39.000000000 +0000 +++ groff-1.22.4/debian/.git-dpm 2023-03-07 09:38:03.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -0c048e31d8ca2f23d799dc97789a6591e05c8a5b -0c048e31d8ca2f23d799dc97789a6591e05c8a5b +f2739609ee9db7e095761472c2b89518866f7cfb +f2739609ee9db7e095761472c2b89518866f7cfb ef16ff6c6e7ff7744b318b73feaeb9a2fadaa748 ef16ff6c6e7ff7744b318b73feaeb9a2fadaa748 groff_1.22.4.orig.tar.gz diff -Nru groff-1.22.4/debian/changelog groff-1.22.4/debian/changelog --- groff-1.22.4/debian/changelog 2022-11-15 15:30:39.000000000 +0000 +++ groff-1.22.4/debian/changelog 2023-03-07 09:38:03.000000000 +0000 @@ -1,3 +1,15 @@ +groff (1.22.4-10) unstable; urgency=medium + + [ Colin Watson ] + * Set upstream metadata fields: Repository-Browse. + + [ G. Branden Robinson ] + * debian/patches/add-groff-1.23-forward-compatibility.patch: Prevent + formatter warnings and dropped man(7) document text when encountering + documents written using new features of groff 1.23. + + -- Colin Watson <cjwat...@debian.org> Tue, 07 Mar 2023 09:38:03 +0000 + groff (1.22.4-9) unstable; urgency=medium * Remove dh_missing override, no longer needed with debhelper v13. diff -Nru groff-1.22.4/debian/patches/add-groff-1.23-forward-compatibility.patch groff-1.22.4/debian/patches/add-groff-1.23-forward-compatibility.patch --- groff-1.22.4/debian/patches/add-groff-1.23-forward-compatibility.patch 1970-01-01 01:00:00.000000000 +0100 +++ groff-1.22.4/debian/patches/add-groff-1.23-forward-compatibility.patch 2023-03-07 09:38:03.000000000 +0000 @@ -0,0 +1,51 @@ +From f2739609ee9db7e095761472c2b89518866f7cfb Mon Sep 17 00:00:00 2001 +From: "G. Branden Robinson" <g.branden.robin...@gmail.com> +Date: Sat, 4 Mar 2023 19:20:45 -0600 +Subject: tmac/{man.local,troffrc}: Add groff 1.23 fw compat + +Patch-Name: add-groff-1.23-forward-compatibility.patch +--- + tmac/man.local | 12 ++++++++++++ + tmac/troffrc | 9 +++++++++ + 2 files changed, 21 insertions(+) + +diff --git a/tmac/man.local b/tmac/man.local +index 3030a84a..563d9a71 100644 +--- a/tmac/man.local ++++ b/tmac/man.local +@@ -2,3 +2,15 @@ + .\" + .\" This file is loaded after an-old.tmac. + .\" Put any local modifications to an-old.tmac here. ++.\" ++.\" for forward compatibility with a groff 1.23 feature ++.if !d MR \{\ ++. \" Provide a simple implementation of the new `MR` macro to avoid ++. \" loss of formatted text. ++. de MR ++. ie \\n(.$=1 \ ++. I \%\\$1 ++. el \ ++. IR \%\\$1 (\\$2)\\$3 ++. . ++.\} +diff --git a/tmac/troffrc b/tmac/troffrc +index 6dca1dbd..845352b2 100644 +--- a/tmac/troffrc ++++ b/tmac/troffrc +@@ -3,6 +3,15 @@ + .\" This is tested by pic. + .nr 0p 0 + . ++.\" for forward compatibility with a groff 1.23 feature ++.if !r .cp \{\ ++. \" Construct an equivalent of groff 1.23's .cp register. Any ++. \" unlikely two-character register name will do. ++. nr }{ \n(.C ++. do nr .cp \n(}{ ++. rr }{ ++.\} ++. + .\" Load composite mappings. + .do mso composite.tmac + . diff -Nru groff-1.22.4/debian/patches/series groff-1.22.4/debian/patches/series --- groff-1.22.4/debian/patches/series 2022-11-15 15:30:39.000000000 +0000 +++ groff-1.22.4/debian/patches/series 2023-03-07 09:38:03.000000000 +0000 @@ -14,3 +14,4 @@ document-sgr.patch destructor-segv.patch clamp-negative-tab-stop-positions.patch +add-groff-1.23-forward-compatibility.patch diff -Nru groff-1.22.4/debian/upstream/metadata groff-1.22.4/debian/upstream/metadata --- groff-1.22.4/debian/upstream/metadata 2022-11-15 15:30:39.000000000 +0000 +++ groff-1.22.4/debian/upstream/metadata 2023-03-07 09:38:03.000000000 +0000 @@ -1,4 +1,4 @@ Name: GNU Troff Bug-Submit: http://savannah.gnu.org/bugs/?group=groff Repository: https://git.sv.gnu.org/git/groff.git -Repository-Browse: https://git.sv.gnu.org/cgit/groff.git +Repository-Browse: https://git.savannah.gnu.org/cgit/groff.git