[kcron] /: move kcron kcm docbook to subdir kcontrol, proofread + update date/releaseinfo

Burkhard Lück null at kde.org
Mon Mar 6 20:32:34 UTC 2017


Git commit 0d795248688f56748bbe9ad6008adc636f9d99f2 by Burkhard Lück.
Committed on 06/03/2017 at 20:31.
Pushed by lueck into branch 'master'.

move kcron kcm docbook to subdir kcontrol, proofread + update date/releaseinfo

the kcron kcm docbook was installed to subdir kcontrol/kcron, but the translated docbooks to subdir kcron,
therefore the language docbooks are not found in kf5 khelpcenter and only the english docbook is displayed

To fix this:
move kcron kcm docbook to subdir kcontrol, consistent to dir layout in kde4 and as dir layout kdeutils/kdf
proofread + update date/releaseinfo
REVIEW:129808

M  +1    -3    doc/CMakeLists.txt
C  +1    -1    doc/kcontrol5/CMakeLists.txt [from: doc/CMakeLists.txt - 071% similarity]
R  +2    -2    doc/kcontrol5/index.docbook [from: doc/index.docbook - 099% similarity]
R  +-    --    doc/kcontrol5/kcronstart.png [from: doc/kcronstart.png - 100% similarity]
R  +-    --    doc/kcontrol5/newtask.png [from: doc/newtask.png - 100% similarity]
R  +-    --    doc/kcontrol5/newvariable.png [from: doc/newvariable.png - 100% similarity]
M  +1    -1    src/kcm_cron.desktop

https://commits.kde.org/kcron/0d795248688f56748bbe9ad6008adc636f9d99f2

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 28c7292..2247186 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,3 +1 @@
-########### install files ###############
-
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcron)
+add_subdirectory(kcontrol5)
diff --git a/doc/CMakeLists.txt b/doc/kcontrol5/CMakeLists.txt
similarity index 71%
copy from doc/CMakeLists.txt
copy to doc/kcontrol5/CMakeLists.txt
index 28c7292..108cf2f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/kcontrol5/CMakeLists.txt
@@ -1,3 +1,3 @@
 ########### install files ###############
 
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcron)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol5/kcron)
diff --git a/doc/index.docbook b/doc/kcontrol5/index.docbook
similarity index 99%
rename from doc/index.docbook
rename to doc/kcontrol5/index.docbook
index 38dfe72..fc234cb 100644
--- a/doc/index.docbook
+++ b/doc/kcontrol5/index.docbook
@@ -42,8 +42,8 @@
 <holder>&Morgan.N.Sandquist;</holder>
 </copyright>
 
-<date>2015-05-27</date>
-<releaseinfo>Plasma 5.3</releaseinfo>
+<date>2017-01-12</date>
+<releaseinfo>Applications 16.12</releaseinfo>
 
 <keywordset>
 <keyword>KDE</keyword>
diff --git a/doc/kcronstart.png b/doc/kcontrol5/kcronstart.png
similarity index 100%
rename from doc/kcronstart.png
rename to doc/kcontrol5/kcronstart.png
diff --git a/doc/newtask.png b/doc/kcontrol5/newtask.png
similarity index 100%
rename from doc/newtask.png
rename to doc/kcontrol5/newtask.png
diff --git a/doc/newvariable.png b/doc/kcontrol5/newvariable.png
similarity index 100%
rename from doc/newvariable.png
rename to doc/kcontrol5/newvariable.png
diff --git a/src/kcm_cron.desktop b/src/kcm_cron.desktop
index 3458286..e412e75 100644
--- a/src/kcm_cron.desktop
+++ b/src/kcm_cron.desktop
@@ -2,7 +2,7 @@
 Exec=kcmshell5 kcm_cron
 Icon=preferences-system-cron
 
-X-DocPath=kcontrol/kcron/index.html
+X-DocPath=kcontrol5/kcron/index.html
 
 Type=Service
 X-KDE-ServiceTypes=KCModule


More information about the kde-doc-english mailing list