[osmium-tool] 32/44: Man page improvements.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jul 21 20:15:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to tag v1.1.0
in repository osmium-tool.
commit 4a6eea40f03206ae99fa35e2ae9cdf799c08abfa
Author: Jochen Topf <jochen at topf.org>
Date: Fri Jul 3 13:34:13 2015 +0200
Man page improvements.
* Put program version instead of timestamp into man pages (helps with
repeatable builds and shows the more interesting information).
* Add info to CONTACT section, what to use contact for.
* CMake config: Make man pages depend on template.
---
CMakeLists.txt | 5 ++---
man/manpage.template | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 957d36a..77998e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ function(add_man_page _section _name)
--variable "section=${_section}"
-o ${_output_file}
${_source_file}
- DEPENDS ${_source_file}
+ DEPENDS ${_source_file} man/manpage.template
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building manpage ${_name}.${_section}"
VERBATIM)
@@ -103,13 +103,12 @@ endfunction()
if(PANDOC)
message(STATUS "Looking for pandoc - found")
message(STATUS " Manual pages will be built")
- execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
set(PANDOC_MAN_OPTIONS
-s
-t man
--template ${CMAKE_CURRENT_SOURCE_DIR}/man/manpage.template
--variable "description=osmium/${OSMIUM_VERSION}"
- --variable "date=${PUBDATE}"
+ --variable "version=${OSMIUM_VERSION}"
--variable "author=${AUTHOR}"
)
set(PANDOC_HTML_OPTIONS -s -t html)
diff --git a/man/manpage.template b/man/manpage.template
index a786f37..7a3bccc 100644
--- a/man/manpage.template
+++ b/man/manpage.template
@@ -1,7 +1,7 @@
$if(has-tables)$
.\"t
$endif$
-.TH "$title$" "$section$" "$date$" "$footer$" "$header$"
+.TH "$title$" "$section$" "$version$" "$footer$" "$header$"
$for(header-includes)$
$header-includes$
$endfor$
@@ -22,6 +22,7 @@ This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
.SH CONTACT
.PP
+If you have any questions or want to report a bug, please go to
http://osmcode.org/contact.html
.SH AUTHORS
$for(author)$$author$$sep$; $endfor$.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list