Git commit f1b7dc703e43ad78b11d0e7e1fb651073dc8eb91 by Marco Martin. Committed on 05/11/2014 at 15:23. Pushed by mart into branch 'master'.
restore documents M +5 -4 CMakeLists.txt M +1 -1 docs/CMakeLists.txt A +2 -0 docs/kpackagetool/CMakeLists.txt R +7 -7 docs/kpackagetool/man-kpackagetool.1.docbook [from: docs/plasmapkg/man-plasmapkg2.1.docbook - 092% similarity] D +0 -2 docs/plasmapkg/CMakeLists.txt http://commits.kde.org/kpackage/f1b7dc703e43ad78b11d0e7e1fb651073dc8eb91 diff --git a/CMakeLists.txt b/CMakeLists.txt index 68ece02..06c0aee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,10 +42,10 @@ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED) -#find_package(KF5DocTools ${KF5_DEP_VERSION}) -#set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate documentation" -# TYPE OPTIONAL -# ) +find_package(KF5DocTools ${KF5_DEP_VERSION}) +set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Tools to generate documentation" + TYPE OPTIONAL + ) ######################################################################### @@ -104,6 +104,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ################# list the subdirectories ################# if (KF5DocTools_FOUND) + add_subdirectory(docs) endif() add_definitions(-DTRANSLATION_DOMAIN=\"libkpackage5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 2acc3f0..f42dc13 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,2 +1,2 @@ -add_subdirectory(plasmapkg) +add_subdirectory(kpackagetool) diff --git a/docs/kpackagetool/CMakeLists.txt b/docs/kpackagetool/CMakeLists.txt new file mode 100644 index 0000000..346982d --- /dev/null +++ b/docs/kpackagetool/CMakeLists.txt @@ -0,0 +1,2 @@ +kdoctools_create_manpage(man-kpackagetool.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) + diff --git a/docs/plasmapkg/man-plasmapkg2.1.docbook b/docs/kpackagetool/man-kpackagetool.1.docbook similarity index 92% rename from docs/plasmapkg/man-plasmapkg2.1.docbook rename to docs/kpackagetool/man-kpackagetool.1.docbook index 0838fad..8f6fe5a 100644 --- a/docs/plasmapkg/man-plasmapkg2.1.docbook +++ b/docs/kpackagetool/man-kpackagetool.1.docbook @@ -5,25 +5,25 @@ <refentry lang="&language;"> <refentryinfo> -<title>Plasma Package Manager</title> +<title>KPackage Manager</title> <date>2014-04-25</date> <releaseinfo>5.0</releaseinfo> -<productname>&kde; plasmapkg2</productname> +<productname>&kde; kpackagetool</productname> </refentryinfo> <refmeta> -<refentrytitle><command>plasmapkg2</command></refentrytitle> +<refentrytitle><command>kpackagetool</command></refentrytitle> <manvolnum>1</manvolnum> </refmeta> <refnamediv> -<refname><command>plasmapkg2</command></refname> +<refname><command>kpackagetool</command></refname> <refpurpose>Install, list, remove Plasma packages</refpurpose> </refnamediv> <refsynopsisdiv> <cmdsynopsis> -<command>plasmapkg2</command> +<command>kpackagetool</command> <group choice="opt"><option>--hash</option> <replaceable> path</replaceable></group> <group choice="opt"><option>-g, --global</option></group> @@ -42,7 +42,7 @@ <refsect1> <title>Description</title> -<para><command>plasmapkg2</command> is a command line tool to +<para><command>kpackagetool</command> is a command line tool to install, list, remove Plasma packages.</para> </refsect1> @@ -110,7 +110,7 @@ url="help:/plasma-desktop">help:/plasma-desktop</ulink> <refsect1> <title>Authors</title> -<para><command>plasmapkg2</command> was written by +<para><command>kpackagetool</command> was written by <personname><firstname>Aaron</firstname><surname>Seigo</surname></personname> <email>aseigo at kde.org</email>.</para> </refsect1> diff --git a/docs/plasmapkg/CMakeLists.txt b/docs/plasmapkg/CMakeLists.txt deleted file mode 100644 index 035af13..0000000 --- a/docs/plasmapkg/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -kdoctools_create_manpage(man-plasmapkg2.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) -