Git commit 84c78978a52cc490896013e7881f0a25e4aa5828 by Jonathan Riddell. Committed on 21/01/2014 at 18:34. Pushed by jriddell into branch 'master'.
rename qtoptions manpage to qt5options rename kdeoptions manpage to kf5options prevents overlapping with equivalent files from kdelibs4 REVIEW:115065 M +2 -2 CMakeLists.txt R +0 -0 checkXML5.in.cmake [from: checkXML.in.cmake - 100% similarity] M +3 -3 docs/CMakeLists.txt D +0 -1 docs/checkXML/CMakeLists.txt A +1 -0 docs/checkXML5/CMakeLists.txt R +4 -4 docs/checkXML5/man-checkXML5.1.docbook [from: docs/checkXML/man-checkXML.1.docbook - 078% similarity] D +0 -1 docs/kdeoptions/CMakeLists.txt A +1 -0 docs/kf5options/CMakeLists.txt R +5 -5 docs/kf5options/man-kf5options.7.docbook [from: docs/kdeoptions/man-kdeoptions.7.docbook - 091% similarity] A +1 -0 docs/qt5options/CMakeLists.txt R +3 -3 docs/qt5options/man-qt5options.7.docbook [from: docs/qtoptions/man-qtoptions.7.docbook - 097% similarity] D +0 -1 docs/qtoptions/CMakeLists.txt http://commits.kde.org/kdoctools/84c78978a52cc490896013e7881f0a25e4aa5828 diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c7af5..56877a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,11 +86,11 @@ install(FILES ) -configure_file(checkXML.in.cmake ${CMAKE_CURRENT_BINARY_DIR}/checkXML ) +configure_file(checkXML5.in.cmake ${CMAKE_CURRENT_BINARY_DIR}/checkXML5 ) include(ConfigureChecks.cmake) configure_file(config-kdoctools.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdoctools.h ) -install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/checkXML DESTINATION ${BIN_INSTALL_DIR} ) +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/checkXML5 DESTINATION ${BIN_INSTALL_DIR} ) install( FILES KF5DocToolsMacros.cmake diff --git a/checkXML.in.cmake b/checkXML5.in.cmake similarity index 100% rename from checkXML.in.cmake rename to checkXML5.in.cmake diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 7e9612f..4efee3b 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,5 +1,5 @@ -add_subdirectory(checkXML) +add_subdirectory(checkXML5) add_subdirectory(meinproc5) -add_subdirectory(kdeoptions) -add_subdirectory(qtoptions) +add_subdirectory(kf5options) +add_subdirectory(qt5options) diff --git a/docs/checkXML/CMakeLists.txt b/docs/checkXML/CMakeLists.txt deleted file mode 100644 index 7f8226c..0000000 --- a/docs/checkXML/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kdoctools_create_manpage(man-checkXML.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/docs/checkXML5/CMakeLists.txt b/docs/checkXML5/CMakeLists.txt new file mode 100644 index 0000000..171a954 --- /dev/null +++ b/docs/checkXML5/CMakeLists.txt @@ -0,0 +1 @@ +kdoctools_create_manpage(man-checkXML5.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/docs/checkXML/man-checkXML.1.docbook b/docs/checkXML5/man-checkXML5.1.docbook similarity index 78% rename from docs/checkXML/man-checkXML.1.docbook rename to docs/checkXML5/man-checkXML5.1.docbook index 2bfb3f3..68509b9 100644 --- a/docs/checkXML/man-checkXML.1.docbook +++ b/docs/checkXML5/man-checkXML5.1.docbook @@ -11,25 +11,25 @@ </refentryinfo> <refmeta> -<refentrytitle><command>checkXML</command></refentrytitle> +<refentrytitle><command>checkXML5</command></refentrytitle> <manvolnum>1</manvolnum> </refmeta> <refnamediv> -<refname><command>checkXML</command></refname> +<refname><command>checkXML5</command></refname> <refpurpose>An &XML; lint tool for &kde; DocBook &XML; documents.</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> -<command>checkXML</command> <arg><replaceable>filename</replaceable></arg> +<command>checkXML5</command> <arg><replaceable>filename</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> <title>Description</title> -<para><command>checkXML</command> is a tool to check for syntax errors in &kde; +<para><command>checkXML5</command> is a tool to check for syntax errors in &kde; DocBook &XML; files. It can also be used for other DocBook based &XML; files, but you should use the less specific xmllint(1) tool if you are not writing or otherwise working on &kde; diff --git a/docs/kdeoptions/CMakeLists.txt b/docs/kdeoptions/CMakeLists.txt deleted file mode 100644 index a91f451..0000000 --- a/docs/kdeoptions/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kdoctools_create_manpage(man-kdeoptions.7.docbook 7 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/docs/kf5options/CMakeLists.txt b/docs/kf5options/CMakeLists.txt new file mode 100644 index 0000000..edc8aa3 --- /dev/null +++ b/docs/kf5options/CMakeLists.txt @@ -0,0 +1 @@ +kdoctools_create_manpage(man-kf5options.7.docbook 7 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/docs/kdeoptions/man-kdeoptions.7.docbook b/docs/kf5options/man-kf5options.7.docbook similarity index 91% rename from docs/kdeoptions/man-kdeoptions.7.docbook rename to docs/kf5options/man-kf5options.7.docbook index 7e62f41..cb7973d 100644 --- a/docs/kdeoptions/man-kdeoptions.7.docbook +++ b/docs/kf5options/man-kf5options.7.docbook @@ -8,17 +8,17 @@ <title>KDE User's Manual</title> <author>&Lauri.Watts; &Lauri.Watts.mail;</author> <date>2004-02-02</date> -<productname>K Desktop Environment</productname> +<productname>KDE Software</productname> </refentryinfo> <refmeta> -<refentrytitle>kdeoptions</refentrytitle> +<refentrytitle>kf5options</refentrytitle> <manvolnum>7</manvolnum> </refmeta> <refnamediv> -<refname>kdeoptions</refname> -<refpurpose>Common commandline options for all applications based on the KDE libraries</refpurpose> +<refname>kf5options</refname> +<refpurpose>Common commandline options for all applications based on KDE Frameworks 5</refpurpose> </refnamediv> <refsynopsisdiv> @@ -69,7 +69,7 @@ titlebar.</para></listitem> <refsect1> <title>See Also</title> -<para><replaceable>qtoptions</replaceable>(7)</para> +<para><replaceable>qt5options</replaceable>(7)</para> </refsect1> diff --git a/docs/qt5options/CMakeLists.txt b/docs/qt5options/CMakeLists.txt new file mode 100644 index 0000000..6a77004 --- /dev/null +++ b/docs/qt5options/CMakeLists.txt @@ -0,0 +1 @@ +kdoctools_create_manpage(man-qt5options.7.docbook 7 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) diff --git a/docs/qtoptions/man-qtoptions.7.docbook b/docs/qt5options/man-qt5options.7.docbook similarity index 97% rename from docs/qtoptions/man-qtoptions.7.docbook rename to docs/qt5options/man-qt5options.7.docbook index a00677a..7afbf07 100644 --- a/docs/qtoptions/man-qtoptions.7.docbook +++ b/docs/qt5options/man-qt5options.7.docbook @@ -12,12 +12,12 @@ </refentryinfo> <refmeta> -<refentrytitle>qtoptions</refentrytitle> +<refentrytitle>qt5options</refentrytitle> <manvolnum>7</manvolnum> </refmeta> <refnamediv> -<refname>qtoptions</refname> +<refname>qt5options</refname> <refpurpose>Common commandline options for all applications based on the Qt toolkit</refpurpose> </refnamediv> @@ -232,7 +232,7 @@ visual on an 8-bit display.</para> <refsect1> <title>See Also</title> -<para><replaceable>kdeoptions</replaceable>(7)</para> +<para><replaceable>kf5options</replaceable>(7)</para> </refsect1> diff --git a/docs/qtoptions/CMakeLists.txt b/docs/qtoptions/CMakeLists.txt deleted file mode 100644 index f1dbb6c..0000000 --- a/docs/qtoptions/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kdoctools_create_manpage(man-qtoptions.7.docbook 7 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
