From cd92098caa64b7fd30cdc6b5d56bf7e9e17a449e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Apr 2022 13:06:44 +0200 Subject: Avoid building all docs in nodoc build profile Differentiating between different types of documentation we build helps in better expressing what needs to be done for our arch:any and arch:all packages currently as well. --- debian/apt-utils.examples | 1 + debian/apt-utils.install | 7 ------- debian/apt-utils.manpages | 6 ++++++ debian/apt.examples | 1 + debian/apt.install | 27 --------------------------- debian/apt.manpages | 26 ++++++++++++++++++++++++++ debian/control | 8 ++++---- debian/rules | 16 ++++++++-------- 8 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 debian/apt-utils.examples create mode 100644 debian/apt-utils.manpages create mode 100644 debian/apt.examples create mode 100644 debian/apt.manpages (limited to 'debian') diff --git a/debian/apt-utils.examples b/debian/apt-utils.examples new file mode 100644 index 000000000..b66de3cdd --- /dev/null +++ b/debian/apt-utils.examples @@ -0,0 +1 @@ +usr/share/doc/apt-utils/examples/* diff --git a/debian/apt-utils.install b/debian/apt-utils.install index a27f1e1e4..9b304e535 100644 --- a/debian/apt-utils.install +++ b/debian/apt-utils.install @@ -3,11 +3,4 @@ usr/bin/apt-ftparchive usr/bin/apt-sortpkgs usr/lib/apt/planners/ usr/lib/apt/solvers/ -usr/share/doc/apt-utils usr/share/locale/*/*/apt-utils.mo -usr/share/man/*/*/apt-extracttemplates.* -usr/share/man/*/*/apt-ftparchive.* -usr/share/man/*/*/apt-sortpkgs.* -usr/share/man/*/apt-extracttemplates.* -usr/share/man/*/apt-ftparchive.* -usr/share/man/*/apt-sortpkgs.* diff --git a/debian/apt-utils.manpages b/debian/apt-utils.manpages new file mode 100644 index 000000000..c61b908ea --- /dev/null +++ b/debian/apt-utils.manpages @@ -0,0 +1,6 @@ +usr/share/man/*/*/apt-extracttemplates.* +usr/share/man/*/*/apt-ftparchive.* +usr/share/man/*/*/apt-sortpkgs.* +usr/share/man/*/apt-extracttemplates.* +usr/share/man/*/apt-ftparchive.* +usr/share/man/*/apt-sortpkgs.* diff --git a/debian/apt.examples b/debian/apt.examples new file mode 100644 index 000000000..3e15bddda --- /dev/null +++ b/debian/apt.examples @@ -0,0 +1 @@ +usr/share/doc/apt/examples/* diff --git a/debian/apt.install b/debian/apt.install index 3658bf5e6..e3a911a9f 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -16,32 +16,5 @@ usr/lib/apt/planners/dump usr/lib/apt/solvers/dump usr/lib/dpkg/methods/apt/ usr/share/bash-completion/completions/ -usr/share/doc/apt usr/share/locale/*/*/apt.mo -usr/share/man/*/*/apt-cache.* -usr/share/man/*/*/apt-cdrom.* -usr/share/man/*/*/apt-config.* -usr/share/man/*/*/apt-get.* -usr/share/man/*/*/apt-key.* -usr/share/man/*/*/apt-mark.* -usr/share/man/*/*/apt-secure.* -usr/share/man/*/*/apt-patterns.* -usr/share/man/*/*/apt.* -usr/share/man/*/*/apt_preferences.* -usr/share/man/*/*/apt_auth.* -usr/share/man/*/*/apt-transport-*.* -usr/share/man/*/*/sources.list.* -usr/share/man/*/apt-cache.* -usr/share/man/*/apt-cdrom.* -usr/share/man/*/apt-config.* -usr/share/man/*/apt-get.* -usr/share/man/*/apt-key.* -usr/share/man/*/apt-mark.* -usr/share/man/*/apt-secure.* -usr/share/man/*/apt-patterns.* -usr/share/man/*/apt.* -usr/share/man/*/apt_preferences.* -usr/share/man/*/apt_auth.* -usr/share/man/*/apt-transport-*.* -usr/share/man/*/sources.list.* var/ diff --git a/debian/apt.manpages b/debian/apt.manpages new file mode 100644 index 000000000..80dbabd44 --- /dev/null +++ b/debian/apt.manpages @@ -0,0 +1,26 @@ +usr/share/man/*/*/apt-cache.* +usr/share/man/*/*/apt-cdrom.* +usr/share/man/*/*/apt-config.* +usr/share/man/*/*/apt-get.* +usr/share/man/*/*/apt-key.* +usr/share/man/*/*/apt-mark.* +usr/share/man/*/*/apt-secure.* +usr/share/man/*/*/apt-patterns.* +usr/share/man/*/*/apt.* +usr/share/man/*/*/apt_preferences.* +usr/share/man/*/*/apt_auth.* +usr/share/man/*/*/apt-transport-*.* +usr/share/man/*/*/sources.list.* +usr/share/man/*/apt-cache.* +usr/share/man/*/apt-cdrom.* +usr/share/man/*/apt-config.* +usr/share/man/*/apt-get.* +usr/share/man/*/apt-key.* +usr/share/man/*/apt-mark.* +usr/share/man/*/apt-secure.* +usr/share/man/*/apt-patterns.* +usr/share/man/*/apt.* +usr/share/man/*/apt_preferences.* +usr/share/man/*/apt_auth.* +usr/share/man/*/apt-transport-*.* +usr/share/man/*/sources.list.* diff --git a/debian/control b/debian/control index 7f10eec3e..44650bfb9 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Rules-Requires-Root: no Standards-Version: 4.1.1 Build-Depends: cmake (>= 3.4), debhelper-compat (= 12), - docbook-xml, - docbook-xsl, + docbook-xml , + docbook-xsl , dpkg-dev (>= 1.20.8), gettext (>= 0.12), googletest | libgtest-dev , @@ -27,9 +27,9 @@ Build-Depends: cmake (>= 3.4), libzstd-dev (>= 1.0), ninja-build, pkg-config, - po4a (>= 0.34-2), + po4a (>= 0.34-2) , triehash, - xsltproc, + xsltproc , zlib1g-dev Build-Depends-Indep: doxygen , graphviz , w3m Vcs-Git: https://salsa.debian.org/apt-team/apt.git diff --git a/debian/rules b/debian/rules index 502840080..9ab42f24c 100755 --- a/debian/rules +++ b/debian/rules @@ -17,12 +17,6 @@ else configure_test_flags = endif -ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) - profile_doc_flags=-DWITH_DOC=ON -else - profile_doc_flags=-DWITH_DOC=OFF -endif - %: dh $@ --buildsystem=cmake+ninja @@ -50,7 +44,13 @@ override_dh_installsystemd: dh_installsystemd -papt --no-restart-on-upgrade --no-restart-after-upgrade --no-start apt-daily.service apt-daily-upgrade.service dh_installsystemd --remaining-packages -override_dh_auto_configure-arch: configure_doc_flags=-DWITH_DOC=OFF -override_dh_auto_configure-indep: configure_doc_flags=$(profile_doc_flags) +ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) +override_dh_auto_configure-arch: configure_doc_flags="-DWITH_DOC=OFF -DWITH_DOC_MANPAGES=ON" +override_dh_auto_configure-indep: configure_doc_flags="-DWITH_DOC=ON" +else +override_dh_auto_configure-arch: configure_doc_flags="-DWITH_DOC=OFF" +override_dh_auto_configure-indep: configure_doc_flags="-DWITH_DOC=OFF" +endif + override_dh_auto_configure-arch override_dh_auto_configure-indep: dh_auto_configure -- -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON $(configure_doc_flags) $(configure_test_flags) -- cgit v1.2.3-70-g09d2