D7413: Adds missing dependency
This revision was automatically updated to reflect the committed changes. Closed by commit R125:db656fd3116b: Adds missing dependency (authored by bkchr, committed by ltoscano). REPOSITORY R125 KHelpCenter CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D7413?vs=18392=18414 REVISION DETAIL https://phabricator.kde.org/D7413 AFFECTED FILES searchhandlers/CMakeLists.txt To: bkchr, ltoscano Cc: #documentation, skadinna
D7413: Adds missing dependency
bkchr added a comment. No I don't have commit access, so it would be nice if you could merge that for me! Please use g...@kchr.de as email address. REPOSITORY R125 KHelpCenter REVISION DETAIL https://phabricator.kde.org/D7413 To: bkchr, ltoscano Cc: #documentation, skadinna
[kstars] doc: Revert all commands containing Meta key
Git commit ee693421fb71e65e2270663233942b3bbe0a9449 by Csaba Kertesz. Committed on 19/08/2017 at 21:36. Pushed by ckertesz into branch 'master'. Revert all commands containing Meta key M +0-80 doc/commands.docbook https://commits.kde.org/kstars/ee693421fb71e65e2270663233942b3bbe0a9449 diff --git a/doc/commands.docbook b/doc/commands.docbook index ed2d4b78a..093ee442c 100644 --- a/doc/commands.docbook +++ b/doc/commands.docbook @@ -545,88 +545,8 @@ current simulation date. - - -I - - - -Opens INDI control window to setup and start telescope equipment. - - - - - - -A - - - -Abort any motion of a connected telescope via INDI. - - - - - - -S - - - -Slew a connected telescope via INDI to the mouse pointer. - - - - - - -T - - - -Track a target under the mouse pointer with a connected telescope via INDI. - - - - - - -Y - - - -Sync a connected telescope via INDI to the mouse pointer. - - - - - - -P - - - -Park a connected telescope via INDI. - - - - - - -U - - - -Unpark a connected telescope via INDI. - - - - - -K - Tools Ekos
[kdoctools] /: Add CC BY-SA 4.0 International and set it as default
Git commit 8c32e153fae80186375d83dbab82bcfc228b1484 by Luigi Toscano.
Committed on 19/08/2017 at 17:50.
Pushed by ltoscano into branch 'master'.
Add CC BY-SA 4.0 International and set it as default
Summary:
New default license (for new documents or relicensed).
Discussed in the previous months on the kde-community@ list
and during Akademy 2017.
Test Plan:
kdoctools compiles. The new license is rendered (with an inline
notice, differently from the "Legal Notice" of FDL).
Reviewers: jriddell, lueck, yurchor
Reviewed By: jriddell, lueck
Subscribers: jriddell, lueck, #frameworks, #documentation
Tags: #frameworks, #documentation
Differential Revision: https://phabricator.kde.org/D6972
A +141 -0common/en/ccbysa4-license.html
M +8-0src/customization/af/lang.entities
M +8-0src/customization/bg/lang.entities
M +8-0src/customization/ca/lang.entities
M +8-0src/customization/cs/lang.entities
M +8-0src/customization/da/lang.entities
M +8-0src/customization/de/lang.entities
M +8-0src/customization/el/lang.entities
M +8-0src/customization/en-GB/lang.entities
M +2-0src/customization/en/catalog.xml
A +4-0src/customization/en/entities/ccbysa4-notice.docbook
A +3-0src/customization/en/entities/underCCBYSA4.docbook
M +5-0src/customization/en/lang.entities
M +1-0src/customization/entities/general.entities
M +8-0src/customization/eo/lang.entities
M +8-0src/customization/es/lang.entities
M +8-0src/customization/et/lang.entities
M +8-0src/customization/fi/lang.entities
M +8-0src/customization/fo/lang.entities
M +8-0src/customization/fr/lang.entities
M +8-0src/customization/gl/lang.entities
M +8-0src/customization/he/lang.entities
M +8-0src/customization/hu/lang.entities
M +8-0src/customization/id/lang.entities
M +8-0src/customization/it/lang.entities
M +8-0src/customization/ja/lang.entities
M +8-0src/customization/ko/lang.entities
M +8-0src/customization/lt/lang.entities
M +8-0src/customization/nds/lang.entities
M +8-0src/customization/nl/lang.entities
M +8-0src/customization/nn/lang.entities
M +8-0src/customization/no/lang.entities
M +8-0src/customization/pl/lang.entities
M +8-0src/customization/pt-BR/lang.entities
M +8-0src/customization/pt/lang.entities
M +8-0src/customization/ro/lang.entities
M +8-0src/customization/ru/lang.entities
M +8-0src/customization/sk/lang.entities
M +8-0src/customization/sl/lang.entities
M +8-0src/customization/sq/lang.entities
M +8-0src/customization/sr/lang.entities
M +8-0src/customization/sr@ijekavian/lang.entities
M +8-0src/customization/sr@ijekavianlatin/lang.entities
M +8-0src/customization/sr@latin/lang.entities
M +8-0src/customization/sv/lang.entities
M +8-0src/customization/th/lang.entities
M +8-0src/customization/tr/lang.entities
M +8-0src/customization/uk/lang.entities
M +8-0src/customization/wa/lang.entities
M +8-0src/customization/xh/lang.entities
M +8-0src/customization/xx/lang.entities
M +8-0src/customization/zh-CN/lang.entities
M +8-0src/customization/zh-TW/lang.entities
M +14 -4src/template.docbook
https://commits.kde.org/kdoctools/8c32e153fae80186375d83dbab82bcfc228b1484
diff --git a/common/en/ccbysa4-license.html b/common/en/ccbysa4-license.html
new file mode 100644
index 000..6cdce87
--- /dev/null
+++ b/common/en/ccbysa4-license.html
@@ -0,0 +1,141 @@
+http://www.w3.org/TR/html40/strict.dtd;>
+
+
+CC BY-SA 4.0 International
+
+
+
+
+
+
+
+
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
License
+By exercising the Licensed Rights (defined below), You accept and agree to
be bound by the terms and conditions of this Creative Commons
Attribution-ShareAlike 4.0 International Public License ("Public License"). To
the extent this Public License may be interpreted as a contract, You are
granted the Licensed Rights in consideration of Your acceptance of these terms
and conditions, and the Licensor grants You such rights in consideration of
benefits the Licensor receives from making the Licensed Material available
under these terms and conditions.
+Section 1 – Definitions.
+
+Adapted Material means material subject to
Copyright and Similar Rights that is derived from or based upon the Licensed
Material and in which the Licensed Material is translated, altered, arranged,
transformed, or otherwise modified in a manner requiring permission under the
Copyright and Similar Rights held by the Licensor. For purposes of this Public
License, where the Licensed Material is a musical work, performance, or sound
recording, Adapted Material is
D6972: Add CC BY-SA 4.0 International and set it as default
This revision was automatically updated to reflect the committed changes. Closed by commit R238:8c32e153fae8: Add CC BY-SA 4.0 International and set it as default (authored by ltoscano). REPOSITORY R238 KDocTools CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D6972?vs=17466=18401 REVISION DETAIL https://phabricator.kde.org/D6972 AFFECTED FILES common/en/ccbysa4-license.html src/customization/af/lang.entities src/customization/bg/lang.entities src/customization/ca/lang.entities src/customization/cs/lang.entities src/customization/da/lang.entities src/customization/de/lang.entities src/customization/el/lang.entities src/customization/en-GB/lang.entities src/customization/en/catalog.xml src/customization/en/entities/ccbysa4-notice.docbook src/customization/en/entities/underCCBYSA4.docbook src/customization/en/lang.entities src/customization/entities/general.entities src/customization/eo/lang.entities src/customization/es/lang.entities src/customization/et/lang.entities src/customization/fi/lang.entities src/customization/fo/lang.entities src/customization/fr/lang.entities src/customization/gl/lang.entities src/customization/he/lang.entities src/customization/hu/lang.entities src/customization/id/lang.entities src/customization/it/lang.entities src/customization/ja/lang.entities src/customization/ko/lang.entities src/customization/lt/lang.entities src/customization/nds/lang.entities src/customization/nl/lang.entities src/customization/nn/lang.entities src/customization/no/lang.entities src/customization/pl/lang.entities src/customization/pt-BR/lang.entities src/customization/pt/lang.entities src/customization/ro/lang.entities src/customization/ru/lang.entities src/customization/sk/lang.entities src/customization/sl/lang.entities src/customization/sq/lang.entities src/customization/sr/lang.entities src/customization/sr@ijekavian/lang.entities src/customization/sr@ijekavianlatin/lang.entities src/customization/sr@latin/lang.entities src/customization/sv/lang.entities src/customization/th/lang.entities src/customization/tr/lang.entities src/customization/uk/lang.entities src/customization/wa/lang.entities src/customization/xh/lang.entities src/customization/xx/lang.entities src/customization/zh-CN/lang.entities src/customization/zh-TW/lang.entities src/template.docbook To: ltoscano, jriddell, lueck, yurchor Cc: jriddell, lueck, #frameworks, #documentation, skadinna
D7413: Adds missing dependency
ltoscano accepted this revision. ltoscano added a comment. This revision is now accepted and ready to land. Thanks; well, it's not a problem for NixOS only, the dependency should be explicit (if not brought up by some other dependency, which is not the case here). This should land in the Applications/17.08 branch. Do you have commit access? If no, I would need your email for the commit credentials. REPOSITORY R125 KHelpCenter REVISION DETAIL https://phabricator.kde.org/D7413 To: bkchr, ltoscano Cc: #documentation, skadinna
[kde-dev-scripts] /: Move cmake to use only KF5 dependencies
Git commit 1799197a1d39104d10a2c2400341b818452656be by Luigi Toscano.
Committed on 19/08/2017 at 12:44.
Pushed by ltoscano into branch 'master'.
Move cmake to use only KF5 dependencies
- remove the kdelibs4-related logic;
- always looks for ECM (bumping a bit the minimum cmake on the way)
and use its variables, with optional KDocTools
- use the native KF5 DTD for the documentation
General ack on the change received on release-t...@kde.org.
M +17 -28 CMakeLists.txt
M +18 -20 doc/CMakeLists.txt
M +1-1doc/man-adddebug.1.docbook
M +1-1doc/man-cheatmake.1.docbook
M +1-1doc/man-create_cvsignore.1.docbook
M +1-1doc/man-create_makefile.1.docbook
M +1-1doc/man-create_makefiles.1.docbook
M +1-1doc/man-cvscheck.1.docbook
M +1-1doc/man-cvslastchange.1.docbook
M +1-1doc/man-cvslastlog.1.docbook
M +1-1doc/man-cvsrevertlast.1.docbook
M +1-1doc/man-cxxmetric.1.docbook
M +1-1doc/man-extend_dmalloc.1.docbook
M +1-1doc/man-extractrc.1.docbook
M +1-1doc/man-fixincludes.1.docbook
M +1-1doc/man-pruneemptydirs.1.docbook
M +1-1doc/man-qtdoc.1.docbook
M +1-1doc/man-reportview.1.docbook
M +1-1doc/man-transxx.1.docbook
M +1-1doc/man-zonetab2pot.py.1.docbook
https://commits.kde.org/kde-dev-scripts/1799197a1d39104d10a2c2400341b818452656be
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d7b7f4..7479263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,13 @@
-cmake_minimum_required(VERSION 2.8.9)
+cmake_minimum_required(VERSION 2.8.12)
project(kde-dev-scripts)
-include(FeatureSummary)
-find_package(KF5DocTools)
-if(KF5DocTools_FOUND)
- find_package(ECM 1.3.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- include(KDEInstallDirs)
- function(create_manpage)
-kdoctools_create_manpage(${ARGN})
- endfunction()
-else()
- find_package(KDE4)
- function(create_manpage)
-kde4_create_manpage(${ARGN})
- endfunction()
-endif()
+find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-if (KDE4_FOUND)
- include(KDE4Defaults)
- include(MacroLibrary)
-else()
- set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "The install
dir for executables")
-endif()
+include(FeatureSummary)
+include(KDEInstallDirs)
+
+find_package(KF5 COMPONENTS DocTools)
# Note that all of these files should be *scripts* that do not require
# compilation, therefore we simply install them. We split out Bourne shell
@@ -30,9 +15,13 @@ endif()
# ones behave well on Mac or Windows just because we don't elide those too.
### install files ###
-if (UNIX)
+if(UNIX)
#shell program
-add_subdirectory( doc )
+
+if(KF5DocTools_FOUND)
+ add_subdirectory(doc)
+endif()
+
install(PROGRAMS
adddebug
build-progress.sh
@@ -65,14 +54,14 @@ install(PROGRAMS
uncrustify-kf5
wcgrep
draw_lib_dependencies
- DESTINATION ${BIN_INSTALL_DIR})
+ DESTINATION ${KDE_INSTALL_BINDIR})
install(FILES
uncrustify-kf5.cfg
uncrustify-qt.cfg
- DESTINATION ${DATA_INSTALL_DIR}/uncrustify)
+ DESTINATION ${KDE_INSTALL_DATADIR}/uncrustify)
-endif (UNIX)
+endif()
install(PROGRAMS
create_makefile
@@ -104,6 +93,6 @@ install(PROGRAMS
kde-systemsettings-tree.py
reviewboard-am
grantlee_strings_extractor.py
- DESTINATION ${BIN_INSTALL_DIR})
+ DESTINATION ${KDE_INSTALL_BINDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 642f1af..212d409 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,22 +1,20 @@
-
-
### install files ###
-create_manpage(man-adddebug.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cheatmake.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-create_cvsignore.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-create_makefile.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-create_makefiles.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-cvscheck.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
-create_manpage(man-cvslastchange.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-cvslastlog.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-cvsrevertlast.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-cxxmetric.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-extend_dmalloc.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-extractrc.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-fixincludes.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
-create_manpage(man-pruneemptydirs.1.docbook 1 INSTALL_DESTINATION
${MAN_INSTALL_DIR})
D7413: Adds missing dependency
bkchr created this revision. Restricted Application added a project: Documentation. Restricted Application added a subscriber: Documentation. REVISION SUMMARY KF5::CoreAddons files are included by khc_xapianindexer, but not declared as dependency. For operating systems like Nixos that is a problem, because every dependency is located in a different path and so, the CoreAddons files are not found in the include path. By adding CoreAddons as target link library, the CoreAddon paths are added to the include paths. REPOSITORY R125 KHelpCenter REVISION DETAIL https://phabricator.kde.org/D7413 AFFECTED FILES searchhandlers/CMakeLists.txt To: bkchr Cc: #documentation, skadinna
D6972: Add CC BY-SA 4.0 International and set it as default
lueck accepted this revision. This revision is now accepted and ready to land. REPOSITORY R238 KDocTools BRANCH add-ccbysa4-translatable REVISION DETAIL https://phabricator.kde.org/D6972 To: ltoscano, jriddell, lueck, yurchor Cc: jriddell, lueck, #frameworks, #documentation, skadinna
