From 4f28604338da2c901439b6b3d7cc6b81b4e512af Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sun, 4 Oct 2009 23:24:46 +0300 Subject: [PATCH] Readd manpage_friendly_docs.diff with new fixes. New manpage formatting problems appeared in CMake 2.8-rc2. --- debian/changelog | 2 + debian/patches/manpage_friendly_docs.diff | 123 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 126 insertions(+) create mode 100644 debian/patches/manpage_friendly_docs.diff diff --git a/debian/changelog b/debian/changelog index 6c4542aab..89a6c861f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ cmake (2.8.0~rc2-0r2) UNRELEASED; urgency=low * Call dpkg with --print-architecture rather than obsolete --print-installation-architecture. * Fix lintian override cmake-data: extra-license-file. + * Readd manpage_friendly_docs.diff with fixes for new manual page formatting + problems. -- Modestas Vainius Sun, 04 Oct 2009 10:31:17 +0300 diff --git a/debian/patches/manpage_friendly_docs.diff b/debian/patches/manpage_friendly_docs.diff new file mode 100644 index 000000000..a69650a1e --- /dev/null +++ b/debian/patches/manpage_friendly_docs.diff @@ -0,0 +1,123 @@ +From: Modestas Vainius +Subject: Fix formatting of cmake module docs to be manpage (groff) friendly + Most problems are fixed (or rather workarounded) by making long ===== + separators pre-formatted (i.e. prefixed with two spaces). In order to preserve + visual view, the code examples themselves are prefixed with 3 spaces. + . + This patch fixes the following man warnings (as of cmake 2.8-rc2): + $ cmake --help-man - | LANG=C MANWIDTH=80 man --warnings -l - > /dev/null + :6024: warning [p 105, 1.7i]: can't break line + :6027: warning [p 105, 2.7i]: cannot adjust line + :6027: warning [p 105, 2.8i]: can't break line + :7142: warning [p 117, 7.8i]: can't break line + :7171: warning [p 117, 11.8i]: can't break line + :8878: warning [p 136, 9.0i]: can't break line + :8887: warning [p 136, 11.5i]: cannot adjust line + :8887: warning [p 136, 11.7i]: can't break line + :8904: warning [p 136, 14.2i]: can't break line +Forwarded: yes + +--- a/Modules/FindBISON.cmake ++++ b/Modules/FindBISON.cmake +@@ -22,13 +22,13 @@ + # BISON_${Name}_OUTPUTS - The sources files generated by bison + # BISON_${Name}_COMPILE_FLAGS - Options used in the bison command line + # +-#==================================================================== +-# Example: ++# ==================================================================== ++# Example: + # +-# find_package(BISON) +-# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp) +-# add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS}) +-#==================================================================== ++# find_package(BISON) ++# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp) ++# add_executable(Foo main.cpp ${BISON_MyParser_OUTPUTS}) ++# ==================================================================== + + #============================================================================= + # Copyright 2009 Kitware, Inc. +--- a/Modules/FindFLEX.cmake ++++ b/Modules/FindFLEX.cmake +@@ -26,23 +26,23 @@ + # where and are the first parameters of + # respectively FLEX_TARGET and BISON_TARGET macros. + # +-#==================================================================== +-# Example: ++# ==================================================================== ++# Example: + # +-# find_package(BISON) +-# find_package(FLEX) ++# find_package(BISON) ++# find_package(FLEX) + # +-# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp +-# FLEX_TARGET(MyScanner lexer.l ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp) +-# ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser) +-# +-# include_directories(${CMAKE_CURRENT_BINARY_DIR}) +-# add_executable(Foo +-# Foo.cc +-# ${BISON_MyParser_OUTPUTS} +-# ${FLEX_MyScanner_OUTPUTS} +-# ) +-#==================================================================== ++# BISON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp ++# FLEX_TARGET(MyScanner lexer.l ${CMAKE_CURRENT_BIANRY_DIR}/lexer.cpp) ++# ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser) ++# ++# include_directories(${CMAKE_CURRENT_BINARY_DIR}) ++# add_executable(Foo ++# Foo.cc ++# ${BISON_MyParser_OUTPUTS} ++# ${FLEX_MyScanner_OUTPUTS} ++# ) ++# ==================================================================== + + #============================================================================= + # Copyright 2009 Kitware, Inc. +--- a/Modules/FindProtobuf.cmake ++++ b/Modules/FindProtobuf.cmake +@@ -11,20 +11,20 @@ + # PROTOBUF_INCLUDE_DIR - The include directory for protocol buffers + # PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler + # +-#==================================================================== +-# Example: ++# ==================================================================== ++# Example: + # +-# find_package(Protobuf REQUIRED) +-# include_directories(${PROTOBUF_INCLUDE_DIRS}) ++# find_package(Protobuf REQUIRED) ++# include_directories(${PROTOBUF_INCLUDE_DIRS}) + # +-# include_directories(${CMAKE_CURRENT_BINARY_DIR}) +-# PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto) +-# add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS}) +-# target_link_libraries(bar ${PROTOBUF_LIBRARY}) ++# include_directories(${CMAKE_CURRENT_BINARY_DIR}) ++# PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto) ++# add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS}) ++# target_link_libraries(bar ${PROTOBUF_LIBRARY}) + # + # NOTE: You may need to link against pthreads, depending + # on the platform. +-#==================================================================== ++# ==================================================================== + # + # PROTOBUF_GENERATE_CPP (public function) + # SRCS = Variable to define with autogenerated +@@ -33,7 +33,7 @@ + # header files + # ARGN = proto files + # +-#==================================================================== ++# ==================================================================== + + + #============================================================================= diff --git a/debian/patches/series b/debian/patches/series index 8db5e45b9..c7c598f78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ FindQt3.cmake.diff kfreebsd-Platform.diff executables-dont-need-fpic.diff fix_bashisms.diff +manpage_friendly_docs.diff