[kde-doc-english] [kde-baseapps/frameworks] /: Move docs.
Christophe Giboudeaux
cgiboudeaux at gmx.com
Sun Jun 29 15:51:07 UTC 2014
Git commit 2b5d67e364949e46452ed1b86fc3bd6b340111cb by Christophe Giboudeaux.
Committed on 29/06/2014 at 15:51.
Pushed by cgiboudeaux into branch 'frameworks'.
Move docs.
M +0 -3 doc/CMakeLists.txt
D +0 -4 doc/dolphin/CMakeLists.txt
D +0 -4 doc/kdepasswd/CMakeLists.txt
D +0 -5 doc/kfind/CMakeLists.txt
M +2 -1 dolphin/CMakeLists.txt
A +2 -0 dolphin/docs/CMakeLists.txt
R +- -- dolphin/docs/default-ui.png [from: doc/dolphin/default-ui.png - 100% similarity]
R +- -- dolphin/docs/grouping-view.png [from: doc/dolphin/grouping-view.png - 100% similarity]
R +0 -0 dolphin/docs/index.docbook [from: doc/dolphin/index.docbook - 100% similarity]
R +- -- dolphin/docs/locationbar-breadcrumb.png [from: doc/dolphin/locationbar-breadcrumb.png - 100% similarity]
R +- -- dolphin/docs/locationbar-context-menu.png [from: doc/dolphin/locationbar-context-menu.png - 100% similarity]
R +- -- dolphin/docs/locationbar-editable.png [from: doc/dolphin/locationbar-editable.png - 100% similarity]
R +- -- dolphin/docs/locationbar-kioslaves-menu.png [from: doc/dolphin/locationbar-kioslaves-menu.png - 100% similarity]
R +- -- dolphin/docs/locationbar-places-icon.png [from: doc/dolphin/locationbar-places-icon.png - 100% similarity]
R +- -- dolphin/docs/nepomuk-search-more-options.png [from: doc/dolphin/nepomuk-search-more-options.png - 100% similarity]
R +- -- dolphin/docs/nepomuk-search.png [from: doc/dolphin/nepomuk-search.png - 100% similarity]
R +- -- dolphin/docs/preferences-general-behavior.png [from: doc/dolphin/preferences-general-behavior.png - 100% similarity]
R +- -- dolphin/docs/preferences-navigation.png [from: doc/dolphin/preferences-navigation.png - 100% similarity]
R +- -- dolphin/docs/preferences-services.png [from: doc/dolphin/preferences-services.png - 100% similarity]
R +- -- dolphin/docs/preferences-startup.png [from: doc/dolphin/preferences-startup.png - 100% similarity]
R +- -- dolphin/docs/preferences-trash.png [from: doc/dolphin/preferences-trash.png - 100% similarity]
R +- -- dolphin/docs/preferences-viewmodes-icons.png [from: doc/dolphin/preferences-viewmodes-icons.png - 100% similarity]
R +- -- dolphin/docs/toolbar-navigation.png [from: doc/dolphin/toolbar-navigation.png - 100% similarity]
R +- -- dolphin/docs/toolbar-view-appearance.png [from: doc/dolphin/toolbar-view-appearance.png - 100% similarity]
R +- -- dolphin/docs/toolbar.png [from: doc/dolphin/toolbar.png - 100% similarity]
R +- -- dolphin/docs/viewproperties-dialog.png [from: doc/dolphin/viewproperties-dialog.png - 100% similarity]
M +3 -1 kdepasswd/CMakeLists.txt
A +1 -0 kdepasswd/docs/CMakeLists.txt
R +0 -0 kdepasswd/docs/index.docbook [from: doc/kdepasswd/index.docbook - 100% similarity]
R +- -- kdepasswd/docs/password.png [from: doc/kdepasswd/password.png - 100% similarity]
M +2 -1 kfind/CMakeLists.txt
A +2 -0 kfind/docs/CMakeLists.txt
R +0 -0 kfind/docs/index.docbook [from: doc/kfind/index.docbook - 100% similarity]
R +0 -0 kfind/docs/man-kfind.1.docbook [from: doc/kfind/man-kfind.1.docbook - 100% similarity]
http://commits.kde.org/kde-baseapps/2b5d67e364949e46452ed1b86fc3bd6b340111cb
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b3340c3..19f5ca2 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1 @@
-add_subdirectory(dolphin)
-add_subdirectory(kfind)
add_subdirectory(konqueror)
-add_subdirectory(kdepasswd)
diff --git a/doc/dolphin/CMakeLists.txt b/doc/dolphin/CMakeLists.txt
deleted file mode 100644
index 45fd7d6..0000000
--- a/doc/dolphin/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-########### install files ###############
-#
-
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
diff --git a/doc/kdepasswd/CMakeLists.txt b/doc/kdepasswd/CMakeLists.txt
deleted file mode 100644
index 45fd7d6..0000000
--- a/doc/kdepasswd/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-########### install files ###############
-#
-
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
diff --git a/doc/kfind/CMakeLists.txt b/doc/kfind/CMakeLists.txt
deleted file mode 100644
index c64bed9..0000000
--- a/doc/kfind/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-########### install files ###############
-#
-
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en)
-kde4_create_manpage(man-kfind.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/dolphin/CMakeLists.txt b/dolphin/CMakeLists.txt
index c6cf5df..859a65d 100644
--- a/dolphin/CMakeLists.txt
+++ b/dolphin/CMakeLists.txt
@@ -19,7 +19,7 @@ ecm_setup_version(${DOLPHIN_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
SOVERSION 5
)
-find_package(KF5 REQUIRED COMPONENTS Init KCMUtils KDELibs4Support NewStuff)
+find_package(KF5 REQUIRED COMPONENTS DocTools Init KCMUtils KDELibs4Support NewStuff)
find_package(KF5 COMPONENTS Activities)
find_package(Phonon4Qt5 CONFIG REQUIRED)
@@ -55,6 +55,7 @@ if (KF5Baloo_FOUND AND KF5BalooWidgets_FOUND AND KF5FileMetaData_FOUND)
endif()
add_subdirectory(src)
+add_subdirectory(docs)
# TODO Remove the if/endif lines if Dolphin is split.
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${Dolphin_SOURCE_DIR}")
diff --git a/dolphin/docs/CMakeLists.txt b/dolphin/docs/CMakeLists.txt
new file mode 100644
index 0000000..57e195b
--- /dev/null
+++ b/dolphin/docs/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR dolphin)
diff --git a/doc/dolphin/default-ui.png b/dolphin/docs/default-ui.png
similarity index 100%
rename from doc/dolphin/default-ui.png
rename to dolphin/docs/default-ui.png
diff --git a/doc/dolphin/grouping-view.png b/dolphin/docs/grouping-view.png
similarity index 100%
rename from doc/dolphin/grouping-view.png
rename to dolphin/docs/grouping-view.png
diff --git a/doc/dolphin/index.docbook b/dolphin/docs/index.docbook
similarity index 100%
rename from doc/dolphin/index.docbook
rename to dolphin/docs/index.docbook
diff --git a/doc/dolphin/locationbar-breadcrumb.png b/dolphin/docs/locationbar-breadcrumb.png
similarity index 100%
rename from doc/dolphin/locationbar-breadcrumb.png
rename to dolphin/docs/locationbar-breadcrumb.png
diff --git a/doc/dolphin/locationbar-context-menu.png b/dolphin/docs/locationbar-context-menu.png
similarity index 100%
rename from doc/dolphin/locationbar-context-menu.png
rename to dolphin/docs/locationbar-context-menu.png
diff --git a/doc/dolphin/locationbar-editable.png b/dolphin/docs/locationbar-editable.png
similarity index 100%
rename from doc/dolphin/locationbar-editable.png
rename to dolphin/docs/locationbar-editable.png
diff --git a/doc/dolphin/locationbar-kioslaves-menu.png b/dolphin/docs/locationbar-kioslaves-menu.png
similarity index 100%
rename from doc/dolphin/locationbar-kioslaves-menu.png
rename to dolphin/docs/locationbar-kioslaves-menu.png
diff --git a/doc/dolphin/locationbar-places-icon.png b/dolphin/docs/locationbar-places-icon.png
similarity index 100%
rename from doc/dolphin/locationbar-places-icon.png
rename to dolphin/docs/locationbar-places-icon.png
diff --git a/doc/dolphin/nepomuk-search-more-options.png b/dolphin/docs/nepomuk-search-more-options.png
similarity index 100%
rename from doc/dolphin/nepomuk-search-more-options.png
rename to dolphin/docs/nepomuk-search-more-options.png
diff --git a/doc/dolphin/nepomuk-search.png b/dolphin/docs/nepomuk-search.png
similarity index 100%
rename from doc/dolphin/nepomuk-search.png
rename to dolphin/docs/nepomuk-search.png
diff --git a/doc/dolphin/preferences-general-behavior.png b/dolphin/docs/preferences-general-behavior.png
similarity index 100%
rename from doc/dolphin/preferences-general-behavior.png
rename to dolphin/docs/preferences-general-behavior.png
diff --git a/doc/dolphin/preferences-navigation.png b/dolphin/docs/preferences-navigation.png
similarity index 100%
rename from doc/dolphin/preferences-navigation.png
rename to dolphin/docs/preferences-navigation.png
diff --git a/doc/dolphin/preferences-services.png b/dolphin/docs/preferences-services.png
similarity index 100%
rename from doc/dolphin/preferences-services.png
rename to dolphin/docs/preferences-services.png
diff --git a/doc/dolphin/preferences-startup.png b/dolphin/docs/preferences-startup.png
similarity index 100%
rename from doc/dolphin/preferences-startup.png
rename to dolphin/docs/preferences-startup.png
diff --git a/doc/dolphin/preferences-trash.png b/dolphin/docs/preferences-trash.png
similarity index 100%
rename from doc/dolphin/preferences-trash.png
rename to dolphin/docs/preferences-trash.png
diff --git a/doc/dolphin/preferences-viewmodes-icons.png b/dolphin/docs/preferences-viewmodes-icons.png
similarity index 100%
rename from doc/dolphin/preferences-viewmodes-icons.png
rename to dolphin/docs/preferences-viewmodes-icons.png
diff --git a/doc/dolphin/toolbar-navigation.png b/dolphin/docs/toolbar-navigation.png
similarity index 100%
rename from doc/dolphin/toolbar-navigation.png
rename to dolphin/docs/toolbar-navigation.png
diff --git a/doc/dolphin/toolbar-view-appearance.png b/dolphin/docs/toolbar-view-appearance.png
similarity index 100%
rename from doc/dolphin/toolbar-view-appearance.png
rename to dolphin/docs/toolbar-view-appearance.png
diff --git a/doc/dolphin/toolbar.png b/dolphin/docs/toolbar.png
similarity index 100%
rename from doc/dolphin/toolbar.png
rename to dolphin/docs/toolbar.png
diff --git a/doc/dolphin/viewproperties-dialog.png b/dolphin/docs/viewproperties-dialog.png
similarity index 100%
rename from doc/dolphin/viewproperties-dialog.png
rename to dolphin/docs/viewproperties-dialog.png
diff --git a/kdepasswd/CMakeLists.txt b/kdepasswd/CMakeLists.txt
index ec7d9f7..dad1d2a 100644
--- a/kdepasswd/CMakeLists.txt
+++ b/kdepasswd/CMakeLists.txt
@@ -19,7 +19,7 @@ ecm_setup_version(${KDEPASSWD_VERSION} VARIABLE_PREFIX KDEPASSWD
)
# Build dependencies
-find_package(KF5 REQUIRED COMPONENTS KDELibs4Support KIO Su)
+find_package(KF5 REQUIRED COMPONENTS KDELibs4Support DocTools KIO Su)
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${Kdepasswd_SOURCE_DIR}")
find_package(KF5Konq CONFIG REQUIRED)
@@ -46,7 +46,9 @@ install(TARGETS kdepasswd ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
add_subdirectory(kcm)
+add_subdirectory(docs)
if("${CMAKE_SOURCE_DIR}" STREQUAL "${Kdepasswd_SOURCE_DIR}")
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
endif()
+
diff --git a/kdepasswd/docs/CMakeLists.txt b/kdepasswd/docs/CMakeLists.txt
new file mode 100644
index 0000000..84253d0
--- /dev/null
+++ b/kdepasswd/docs/CMakeLists.txt
@@ -0,0 +1 @@
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kdepasswd)
diff --git a/doc/kdepasswd/index.docbook b/kdepasswd/docs/index.docbook
similarity index 100%
rename from doc/kdepasswd/index.docbook
rename to kdepasswd/docs/index.docbook
diff --git a/doc/kdepasswd/password.png b/kdepasswd/docs/password.png
similarity index 100%
rename from doc/kdepasswd/password.png
rename to kdepasswd/docs/password.png
diff --git a/kfind/CMakeLists.txt b/kfind/CMakeLists.txt
index 0b85cb7..609e3fc 100644
--- a/kfind/CMakeLists.txt
+++ b/kfind/CMakeLists.txt
@@ -20,7 +20,7 @@ ecm_setup_version(${KFIND_VERSION} VARIABLE_PREFIX KFIND
)
# Build dependencies
-find_package(KF5 REQUIRED COMPONENTS KDELibs4Support Archive)
+find_package(KF5 REQUIRED COMPONENTS KDELibs4Support Archive DocTools)
if("${CMAKE_SOURCE_DIR}" STREQUAL "${Kfind_SOURCE_DIR}")
find_package(KF5Konq CONFIG REQUIRED)
@@ -53,6 +53,7 @@ install(TARGETS kfind ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS kfind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
add_subdirectory(icons)
+add_subdirectory(docs)
if("${CMAKE_SOURCE_DIR}" STREQUAL "${Kfind_SOURCE_DIR}")
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kfind/docs/CMakeLists.txt b/kfind/docs/CMakeLists.txt
new file mode 100644
index 0000000..0555e96
--- /dev/null
+++ b/kfind/docs/CMakeLists.txt
@@ -0,0 +1,2 @@
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kfind)
+kdoctools_create_manpage(man-kfind.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
diff --git a/doc/kfind/index.docbook b/kfind/docs/index.docbook
similarity index 100%
rename from doc/kfind/index.docbook
rename to kfind/docs/index.docbook
diff --git a/doc/kfind/man-kfind.1.docbook b/kfind/docs/man-kfind.1.docbook
similarity index 100%
rename from doc/kfind/man-kfind.1.docbook
rename to kfind/docs/man-kfind.1.docbook
More information about the kde-doc-english
mailing list