Source: mdocml Version: 1.14.6-1 Severity: minor Tags: patch Dear Maintainer,
This makes sense /only/, as the manual lays forth,
for systems pre-dating -mdoc ‒ Debian is very much /not/ one of them ‒
and, as the manual doesn't, it strips a lot of mark-up,
which looks passable for -Tutf8, but not for anything else
AFAICT, there has never been a reason to do this,
and none is listed, d/i_m just appears in Bdale's the initial commit:
just don't do it
All I can think of is confusion that maybe mdoc(7) is exclusive to
mandoc, and isn't supported by normal *roff distributions?
This is wrong, of course, but it wouldn't be the first time
I've heard this.
Additionally, this makes most of the installed manuals slightly smaller
(admittedly, not by much, but it's a nice bonus either way):
before after diff file
1571 1498 -73 ./usr/share/man/man1/demandoc.1.gz
18598 18296 -302 ./usr/share/man/man1/mandoc.1.gz
4309 4145 -164 ./usr/share/man/man1/mapropos.1.gz
4237 4073 -164 ./usr/share/man/man1/mman.1.gz
1442 1357 -85 ./usr/share/man/man1/msoelim.1.gz
1896 1857 -39 ./usr/share/man/man5/man.conf.5.gz
2374 2319 -55 ./usr/share/man/man5/mandoc.db.5.gz
8329 8811 482 ./usr/share/man/man7/mandoc_char.7.gz
5035 4911 -124 ./usr/share/man/man7/mandoc_eqn.7.gz
5722 5673 -49 ./usr/share/man/man7/mandoc_man.7.gz
23213 22424 -789 ./usr/share/man/man7/mandoc_mdoc.7.gz
17843 17414 -429 ./usr/share/man/man7/mandoc_roff.7.gz
4283 4184 -99 ./usr/share/man/man7/mandoc_tbl.7.gz
2410 2306 -104 ./usr/share/man/man8/makewhatis.8.gz
2357 2270 -87 ./usr/share/man/man8/mandocd.8.gz
2364 2254 -110 ./usr/share/man/man8/mcatman.8.gz
105983 103792 -2191 total
Attaching patch for this based on current Salsa HEAD,
also forwarded as MR 1 on there:
https://salsa.debian.org/debian/mdocml/-/merge_requests/1
Best,
наб
-- System Information:
Debian Release: 11.5
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500,
'stable-debug'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.10.0-17-amd64 (SMP w/24 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_FIRMWARE_WORKAROUND,
TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
From 3a443b5999ce93570489b0d6c742aa649dec893d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz>
Date: Wed, 26 Oct 2022 12:38:33 +0200
Subject: [PATCH] Don't filter installed manuals through -Tman
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mutt-PGP: OS
This makes sense /only/, as the manual lays forth,
for systems pre-dating -mdoc ‒ Debian is very much /not/ one of them ‒
and, as the manual doesn't, it strips a lot of mark-up,
which looks passable for -Tutf8, but not for anything else
AFAICT, there has never been a reason to do this,
and none is listed, d/i_m just appears in Bdale's the initial commit:
just don't do it
---
debian/install_mandoc | 15 ---------------
debian/patches/configure.local.patch | 3 +--
2 files changed, 1 insertion(+), 17 deletions(-)
delete mode 100755 debian/install_mandoc
diff --git a/debian/install_mandoc b/debian/install_mandoc
deleted file mode 100755
index 1c68191..0000000
--- a/debian/install_mandoc
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Wraps install(1), converting mdoc documents to man documents before.
-
-eval target=\${$#}
-
-TMP=$(mktemp -d)
-
-while [ "$2" != "" ]; do
- # Keep the filename, it is used by install(1) when target is a directory.
- ./mandoc -Tman $1 > "$TMP/$1"
- install -m 0444 "$TMP/$1" "$target"
- shift
-done
-
-rm -rf "$TMP"
diff --git a/debian/patches/configure.local.patch b/debian/patches/configure.local.patch
index 25321d8..1061f6d 100644
--- a/debian/patches/configure.local.patch
+++ b/debian/patches/configure.local.patch
@@ -5,13 +5,12 @@ Index: mdocml/configure.local
===================================================================
--- /dev/null
+++ mdocml/configure.local
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,18 @@
+HAVE_WCHAR=1
+OSNAME="Debian"
+PREFIX="/usr"
+MANDIR="${PREFIX}/share/man"
+EXAMPLEDIR="${PREFIX}/share/doc/mandoc"
-+INSTALL_MAN="debian/install_mandoc"
+MANM_MAN="mandoc_man" # default is "man"
+MANM_MDOC="mandoc_mdoc" # default is "mdoc"
+MANM_ROFF="mandoc_roff" # default is "roff"
--
2.30.2
signature.asc
Description: PGP signature
