Git commit 6b9d09c107e90c667ef3884b7e00796292ad6539 by Burkhard Lück. Committed on 08/11/2016 at 16:14. Pushed by lueck into branch 'master'.
Rename subdir kcontrol to kcontrol5 in distributions the doc packages for kdelibs4support and kde-runtime are usually designed to be co-installable, but this fails in some distributions due to conflicting file paths, therefore: * subdir kcontrol is renamed to kcontrol5 * install target for kcm_ssl docbook changed to kcontrol5 * X-DocPath changed to kcontrol5/kcm_ssl/index.html REVIEW:129209 M +1 -1 docs/CMakeLists.txt R +0 -0 docs/kcontrol5/CMakeLists.txt [from: docs/kcontrol/CMakeLists.txt - 100% similarity] R +1 -1 docs/kcontrol5/kcm_ssl/CMakeLists.txt [from: docs/kcontrol/kcm_ssl/CMakeLists.txt - 066% similarity] R +- -- docs/kcontrol5/kcm_ssl/details.png [from: docs/kcontrol/kcm_ssl/details.png - 100% similarity] R +0 -0 docs/kcontrol5/kcm_ssl/index.docbook [from: docs/kcontrol/kcm_ssl/index.docbook - 100% similarity] R +- -- docs/kcontrol5/kcm_ssl/module.png [from: docs/kcontrol/kcm_ssl/module.png - 100% similarity] M +1 -1 src/kssl/kcm/kcm_ssl.desktop http://commits.kde.org/kdelibs4support/6b9d09c107e90c667ef3884b7e00796292ad6539 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index f90fa81..3743811 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(kf5-config) add_subdirectory(kdebugdialog5) -add_subdirectory(kcontrol) +add_subdirectory(kcontrol5) diff --git a/docs/kcontrol/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt similarity index 100% rename from docs/kcontrol/CMakeLists.txt rename to docs/kcontrol5/CMakeLists.txt diff --git a/docs/kcontrol/kcm_ssl/CMakeLists.txt b/docs/kcontrol5/kcm_ssl/CMakeLists.txt similarity index 66% rename from docs/kcontrol/kcm_ssl/CMakeLists.txt rename to docs/kcontrol5/kcm_ssl/CMakeLists.txt index 4d3bc75..793a699 100644 --- a/docs/kcontrol/kcm_ssl/CMakeLists.txt +++ b/docs/kcontrol5/kcm_ssl/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcm_ssl) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol5/kcm_ssl) diff --git a/docs/kcontrol/kcm_ssl/details.png b/docs/kcontrol5/kcm_ssl/details.png similarity index 100% rename from docs/kcontrol/kcm_ssl/details.png rename to docs/kcontrol5/kcm_ssl/details.png diff --git a/docs/kcontrol/kcm_ssl/index.docbook b/docs/kcontrol5/kcm_ssl/index.docbook similarity index 100% rename from docs/kcontrol/kcm_ssl/index.docbook rename to docs/kcontrol5/kcm_ssl/index.docbook diff --git a/docs/kcontrol/kcm_ssl/module.png b/docs/kcontrol5/kcm_ssl/module.png similarity index 100% rename from docs/kcontrol/kcm_ssl/module.png rename to docs/kcontrol5/kcm_ssl/module.png diff --git a/src/kssl/kcm/kcm_ssl.desktop b/src/kssl/kcm/kcm_ssl.desktop index 6ec8be6..bd29330 100644 --- a/src/kssl/kcm/kcm_ssl.desktop +++ b/src/kssl/kcm/kcm_ssl.desktop @@ -8,7 +8,7 @@ X-KDE-Library=kcm_ssl X-KDE-ParentApp=kcontrol X-KDE-System-Settings-Parent-Category=networksettings X-KDE-Weight=70 -X-DocPath=kcontrol/kcm_ssl/index.html +X-DocPath=kcontrol5/kcm_ssl/index.html Name=SSL Preferences Name[ar]=تفضيلات SSL
