This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=299e5fc84266c0c952039642ab94451b4276775b commit 299e5fc84266c0c952039642ab94451b4276775b Author: Guillem Jover <[email protected]> AuthorDate: Mon May 25 22:18:54 2020 +0200 build: Install public documents in docdir These are supposed to be installed, as some of them are referenced from the man pages. Update those references to use the new standardized paths. --- Makefile.am | 13 ++++++++----- debian/changelog | 1 + debian/dpkg-dev.docs | 6 +++--- debian/dpkg.docs | 4 ++-- man/deb-triggers.man | 3 +-- man/dpkg-trigger.man | 3 +-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4919a8e5c..ce184b364 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,14 @@ dist_pkgdata_DATA = \ data/tupletable \ $(nil) +dist_doc_DATA = \ + doc/README.api \ + doc/README.feature-removal-schedule \ + doc/frontend.txt \ + doc/rootless-builds.txt \ + doc/triggers.txt \ + $(nil) + EXTRA_DIST = \ .gitlab-ci.yml \ .mailmap \ @@ -52,13 +60,8 @@ EXTRA_DIST = \ autogen \ get-version \ run-script \ - doc/README.api \ - doc/README.feature-removal-schedule \ doc/coding-style.txt \ - doc/frontend.txt \ doc/lcov-inject.pl \ - doc/rootless-builds.txt \ - doc/triggers.txt \ debian/README.bug-usertags \ debian/bug-script \ debian/changelog \ diff --git a/debian/changelog b/debian/changelog index 1ed1effb9..34bb52055 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium Closes: #961850 - Add man page number suffixes to the automake SUFFIXES variable. - Update false positive suppressions for cppcheck 1.20. + - Install specifications and API contracts in docdir. * Packaging: - Switch to debhelper compatibility level 13. - Remove debian/tmp prefix from manpages debhelper fragment files. diff --git a/debian/dpkg-dev.docs b/debian/dpkg-dev.docs index cdf99685e..82b8ada6b 100644 --- a/debian/dpkg-dev.docs +++ b/debian/dpkg-dev.docs @@ -1,3 +1,3 @@ -doc/frontend.txt -doc/rootless-builds.txt -doc/triggers.txt +usr/share/doc/dpkg/frontend.txt +usr/share/doc/dpkg/rootless-builds.txt +usr/share/doc/dpkg/triggers.txt diff --git a/debian/dpkg.docs b/debian/dpkg.docs index 3c0f10d21..308db3568 100644 --- a/debian/dpkg.docs +++ b/debian/dpkg.docs @@ -1,5 +1,5 @@ AUTHORS THANKS debian/README.bug-usertags -doc/README.api -doc/README.feature-removal-schedule +usr/share/doc/dpkg/README.api +usr/share/doc/dpkg/README.feature-removal-schedule diff --git a/man/deb-triggers.man b/man/deb-triggers.man index 46d673dc4..41c2811ce 100644 --- a/man/deb-triggers.man +++ b/man/deb-triggers.man @@ -108,5 +108,4 @@ depending on how it was activated. .SH SEE ALSO .BR dpkg\-trigger (1), .BR dpkg (1), -.\" FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev. -.BR /usr/share/doc/dpkg\-dev/triggers.txt.gz . +.BR %PKGDOCDIR%/triggers.txt.gz . diff --git a/man/dpkg-trigger.man b/man/dpkg-trigger.man index 942c863cb..49d247e26 100644 --- a/man/dpkg-trigger.man +++ b/man/dpkg-trigger.man @@ -110,5 +110,4 @@ The currently accepted values are: \fBauto\fP (default), \fBalways\fP and .SH SEE ALSO .BR dpkg (1), .BR deb\-triggers (5), -.\" FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev. -.BR /usr/share/doc/dpkg\-dev/triggers.txt.gz . +.BR %PKGDOCDIR%/triggers.txt.gz . -- Dpkg.Org's dpkg
