diff options
| author | Julian Andres Klode <jak@debian.org> | 2023-01-05 15:02:40 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2023-01-05 15:02:40 +0000 |
| commit | 5919d2d18eac6e445a59da23246df94258e103eb (patch) | |
| tree | b7629e8a8cae7075e0a10ff2dcfcab91ce1bfd44 | |
| parent | f0f721b2d45aebfde9bd47b4c812a747626b3f98 (diff) | |
| parent | 47dd3f008663cb4f47eb3129e0fe721731bd4b57 (diff) | |
Merge branch 'fix/doc-ftparchive-path-repeats' into 'main'
Do not document path to be repeatable in apt-ftparchive cmds
See merge request apt-team/apt!267
| -rw-r--r-- | CMake/Documentation.cmake | 15 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 |
3 files changed, 10 insertions, 9 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}) 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 @@ <arg choice='plain' rep='repeat'>&synopsis-param-filename;</arg> &synopsis-help; </cmdsynopsis></refsynopsisdiv>"> -<!ENTITY synopsis-arg-ftparchive "<arg choice='plain' rep='repeat'><replaceable>&synopsis-path;</replaceable></arg><arg><filename><replaceable>&synopsis-override;</replaceable></filename><arg><replaceable>&synopsis-pathprefix;</replaceable></arg></arg>"> +<!ENTITY synopsis-arg-ftparchive "<arg choice='plain'><replaceable>&synopsis-path;</replaceable></arg><arg><filename><replaceable>&synopsis-override;</replaceable></filename><arg><replaceable>&synopsis-pathprefix;</replaceable></arg></arg>"> <!ENTITY synopsis-command-apt-ftparchive "<refsynopsisdiv><cmdsynopsis> <command>apt-ftparchive</command> <arg><option>-dsq</option></arg> |