From acb5002a7cd03253522978e70258589e9b262216 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 2 Nov 2022 12:40:24 +0100 Subject: Set our entities as dependencies in manpage generation Changes in the entities do not lead to a rebuild of the manpages otherwise. We also try to have each lingua have its own (translated) entities as dependencies rather than all as the old code order would have suggested. Gbp-Dch: Ignore --- CMake/Documentation.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CMake/Documentation.cmake b/CMake/Documentation.cmake index 1df0960a4..f3eb4c5e1 100644 --- a/CMake/Documentation.cmake +++ b/CMake/Documentation.cmake @@ -270,20 +270,20 @@ function(add_docbook target) list(APPEND formats MANPAGE) endif() - foreach(document ${DOC_TRANSLATED_ENTITIES}) - foreach(lang ${DOC_LINGUAS}) - po4a_one(po4a_stamp po4a_out ${document} "${lang}" "") - list(APPEND DOC_DEPENDS ${po4a_stamp}) - endforeach() - endforeach() - foreach(document ${DOC_DOCUMENTS}) foreach(lang ${DOC_LINGUAS}) + set(DOC_TRANSLATED_DEPENDS ${DOC_DEPENDS}) + foreach(entity ${DOC_TRANSLATED_ENTITIES}) + po4a_one(po4a_stamp po4a_out ${entity} "${lang}" "") + list(APPEND DOC_TRANSLATED_DEPENDS ${po4a_stamp}) + endforeach() + po4a_one(po4a_stamp po4a_out ${document} "${lang}" "${DOC_DEPENDS}") xsltproc_one(STAMP_OUT xslt_stamp STAMP ${po4a_stamp} FULL_DOCUMENT ${po4a_out} INSTALL ${DOC_INSTALL} + DEPENDS "${DOC_TRANSLATED_DEPENDS}" ${formats}) list(APPEND stamps ${xslt_stamp}) @@ -292,6 +292,7 @@ function(add_docbook target) STAMP ${document} FULL_DOCUMENT ${document} INSTALL ${DOC_INSTALL} + DEPENDS "${DOC_DEPENDS}" ${formats}) list(APPEND stamps ${xslt_stamp}) -- cgit v1.2.3-70-g09d2 From 47dd3f008663cb4f47eb3129e0fe721731bd4b57 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 2 Nov 2022 13:04:11 +0100 Subject: Do not document path to be repeatable in apt-ftparchive cmds The manpage for apt-ftparchive {packages,sources} claims that the path argument can be repeated, but that logically conflicts with having two optional arguments after that and isn't implemented in code either, so we just adapt the documentation to reality here. So, since when is this documentation wrong? The manpage is currently written in xml (since 2004), but the sgml before that had the same mistake included all the way back to a time in which time itself is not stable (the commit is dated in git 2004, but the commit message says 2001 while including a d/changelog stanza dated 2000) in my favorite commit "Join with aliencode" which brought in a whole lot of stuff adding also (quoting said d/changelog entry) "apt-ftparchive the all dancing all singing FTP archive maintenance program". In other words: It was documented this way for more than 22 years. Reported-By: Michael Tokarev on IRC --- debian/changelog | 2 +- doc/apt-verbatim.ent | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 764b55632..43003dae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11775,7 +11775,7 @@ apt (0.5.0) unstable; urgency=low * Ability to parse and return source index build depends from Randolph. * new 'apt-get build-dep' command from Randolph. Closes: #63982 * Added apt-ftparchive the all dancing all singing FTP archive - maintinance program + maintenance program * Allow version specifications with =1.2.4-3 and /2.2 or /stable postfixes in apt-get. * Removed useless internal cruft including the xstatus file. diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index b67b7a060..6e08a73c4 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -403,7 +403,7 @@ &synopsis-param-filename; &synopsis-help; "> -&synopsis-path;&synopsis-override;&synopsis-pathprefix;"> +&synopsis-path;&synopsis-override;&synopsis-pathprefix;"> apt-ftparchive -- cgit v1.2.3-70-g09d2