[added Alex Colomar to CC]
At 2023-02-26T13:30:58+0000, Colin Watson wrote:
> Sorry about that! Feel free to grab me on IRC if I'm not replying to
> email.
Ah! I'm never on IRC anymore. I shifted to machines with power
management for everyday use; the loss of a nailed-up Internet connection
destroyed my IRC continuity. (I hear there are ways around this...)
> > I am not a proficient gbp user, but I think I have done what is
> > necessary.
>
> groff doesn't use gbp - it uses git-dpm.
Right. You told me that before and the information trickled out of my
sieve-like brain. TLA overload, so I was SOL. FML.
> If you try to use gbp for it then you will probably get quite confused
> and so will I, so please don't.
Yes, indeed, thanks.
> First, move your current branch somewhere for reference, then make a new
> one. Then, my routine for pulling in new upstreams looks roughly like
> this:
>
> git-dpm import-new-upstream -p $UPSTREAMTAG^{} --rebase-patched ../foo.orig.tar.gz
> # this imports the unpacked upstream tarball onto an upstream branch
> # based on $UPSTREAMTAG, then drops you into a rebase session
>
> ... continue with rebase as needed, then once you're finished ...
>
> git-dpm update-patches --amend
> # the --amend is just because the import-new-upstream step will
> # already have recorded the new upstream on the branch you started
> # from, but the history looks clearer if you bundle the rebase with
> # that in a single merge commit, which this does
>
> Then you can cherry-pick your packaging changes on top of this, as well
> as telling pristine-tar about the new upstream tarball based on the
> appropriate imported branch.
>
> If you push the results to a temporary branch on salsa then I can look
> over them, which is probably a good idea since you're unfamiliar with
> git-dpm.
Thanks for this. I also found
https://wiki.debian.org/PackagingWithGit/GitDpm which is helpful for my
fallback plan described below.
> > How do we move forward with this? I am anxious about the closing of the
> > soft freeze window.
>
> There is no way that this giant new upstream release will be suitable
> at this stage in the freeze; it's too late. This should be targeted
> at experimental.
Oh, man. That really sucks the wind out of my sails. :(
(Good thing I did the packaging update work already!)
The freeze policy says, "Starting 2023-02-12, only small, targeted fixes
are appropriate for bookworm. We want maintainers to focus on small,
targeted fixes. This is mainly at the maintainers discretion, there will
be no hard rule that will be enforced."[1]
I was kind of hoping for an exercise of that discretion in favor of
getting the groff release in. I hope you feel I have been attentive to
issues of implementation quality. Nevertheless I admit I have a
conflict of interest as an active upstream (for the moment, still
unoffical) co-maintainer who wants to see his 4,000 commits including
400 bug fixes get into the next Debian release.[2]
But, also, Bertrand Garrigues (GNU maintainer, who has had to step back
quite a bit for personal reasons) is going to be unavailable to tag
1.23.0 final until _next_ weekend so I think groff and Debian release
timing may simply have a curse on them.
Please find attached my much more modest proposal. Let's make sure the
groff in Debian bookworm will not throw confusing undefined register
warnings or drop text from man pages that begin to embrace groff 1.23's
new features.
Alex Colomar, the Linux man-pages maintainer, is eager to adopt the new
man(7) MR macro ASAP, so that's 2,500 man pages, many commonly used,
that will be undergoing a transition in the next few months, I expect.
Meanwhile I reckon I'll start praying to the gods of backports and point
releases.
Regards,
Branden
[1] https://release.debian.org/testing/freeze_policy.html#soft
[2] https://git.savannah.gnu.org/cgit/groff.git/tree/ANNOUNCE?id=99e5b4ae55a7c222f6bf57b355289a88d862478d
https://git.savannah.gnu.org/cgit/groff.git/tree/NEWS?id=99e5b4ae55a7c222f6bf57b355289a88d862478d
commit 69e844df84929b8a6a440cbbafe55dcd134107b6
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Mon Feb 27 06:27:17 2023 -0600
Rename and document patch
diff --git a/debian/changelog b/debian/changelog
index ca8a27d5..4f867aeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-groff (1.22.4-10) UNRELEASED; urgency=medium
+groff (1.22.4-10) unstable; urgency=medium
+ [ Colin Watson ]
* Set upstream metadata fields: Repository-Browse.
- -- Colin Watson <cjwatson@debian.org> Mon, 02 Jan 2023 13:38:52 -0000
+ [ 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.
+
+ -- G. Branden Robinson <g.branden.robinson@gmail.com> Mon, 27 Feb 2023 06:30:24 -0600
groff (1.22.4-9) unstable; urgency=medium
diff --git a/debian/patches/0017-tmac-man.local-troffrc-Add-groff-1.23-fw-compat.patch b/debian/patches/add-groff-1.23-forward-compatibility.patch
similarity index 96%
rename from debian/patches/0017-tmac-man.local-troffrc-Add-groff-1.23-fw-compat.patch
rename to debian/patches/add-groff-1.23-forward-compatibility.patch
index b71179b0..c71b3918 100644
--- a/debian/patches/0017-tmac-man.local-troffrc-Add-groff-1.23-fw-compat.patch
+++ b/debian/patches/add-groff-1.23-forward-compatibility.patch
@@ -4,6 +4,9 @@ Date: Mon, 27 Feb 2023 06:22:31 -0600
Subject: tmac{man.local,troffrc}: Add groff 1.23 fw compat
X-Mutt-PGP: OS
+Forwarded: not-needed
+Last-Update: 2022-02-27
+
---
tmac/man.local | 12 ++++++++++++
tmac/troffrc | 9 +++++++++
diff --git a/debian/patches/series b/debian/patches/series
index 1f8fe443..2dbf599d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,4 @@ bsd-updates.patch
document-sgr.patch
destructor-segv.patch
clamp-negative-tab-stop-positions.patch
-0017-tmac-man.local-troffrc-Add-groff-1.23-fw-compat.patch
+add-groff-1.23-forward-compatibility.patch
commit 87a3f23961cb4e1a59df6d1d0c2be87d42e1256e
Merge: 44f37570 a370cf62
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Mon Feb 27 06:23:38 2023 -0600
merge patched into master
commit a370cf6243be6dda3f5eed6f0ae9f3dd1b858914
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date: Mon Feb 27 06:22:31 2023 -0600
tmac{man.local,troffrc}: Add groff 1.23 fw compat
diff --git a/tmac/man.local b/tmac/man.local
index 3030a84a..bd6604a1 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 that avoids
+. \" 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..07986374 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 register name will do.
+. nr }{ \n(.C
+. do nr .cp \n(}{
+. rr }{
+.\}
+.
.\" Load composite mappings.
.do mso composite.tmac
.
Attachment:
signature.asc
Description: PGP signature