----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/117781/ -----------------------------------------------------------
(Updated April 26, 2014, 1:29 p.m.) Status ------ This change has been marked as submitted. Review request for Documentation and KDE Frameworks. Repository: kdoctools Description ------- Install again common/, but: - under a different prefix - change the structure to allow the installation of the localized common files for other languages. Those files currently live in SVN under trunk/l10n-kde4/<lang>/docs/common but those directories will be removed for kf5 and the content, if any, will be imported here. This is the combination of four commits which can be checked here: http://quickgit.kde.org/?p=clones%2Fkdoctools%2Fltoscano%2Fkdoctools-tosky.git&a=log&h=9cd70da7d44147eeb0b119f77bb08e8bb00e87d7 Commit logs (older first): --- Move the definition of language list to the parent CMakeLists.txt The list can be then reused (namely by common/) --- Move "en" common doc files to own directory --- Install common doc files for all the languages common/CMakeLists.txt has been completely rewritten; it now supports a set of language directories and all the files included there. Right now only en/ is defined, other common files will be added using the corresponding files from trunk/l10n-kde4/<lang>/docs/common/ (SVN). --- Enable common/ for a different prefix, adapt kde-chunk.xsl Common files are installed again as it was in kdelibs4, but under a different prefix (kdoctools5-common) to avoid conflicts with the "old" common directory from kdelibs4. kde-chunk.xsl has been adapted to use this new prefix. Diffs ----- common/artistic-license.html 2069b4e CMakeLists.txt 3e41a26 common/CMakeLists.txt 4228625 common/block_title_bottom.png c0c0af5 common/block_title_mid.png f1ce933 common/block_title_top.png 2344376 common/bsd-license.html 422bb33 common/en/artistic-license.html PRE-CREATION common/en/block_title_bottom.png PRE-CREATION common/en/block_title_mid.png PRE-CREATION common/en/block_title_top.png PRE-CREATION common/en/bsd-license.html PRE-CREATION common/en/fdl-license.html PRE-CREATION common/en/fdl-notice.html PRE-CREATION common/en/gpl-license.html PRE-CREATION common/en/kde-default.css PRE-CREATION common/en/kde-docs.css PRE-CREATION common/en/kde_logo.png PRE-CREATION common/en/kde_logo_bg.png PRE-CREATION common/en/kmenu.png PRE-CREATION common/en/lgpl-license.html PRE-CREATION common/en/qpl-license.html PRE-CREATION common/en/top-kde.jpg PRE-CREATION common/en/top-left.jpg PRE-CREATION common/en/top-right.jpg PRE-CREATION common/en/top.jpg PRE-CREATION common/en/x11-license.html PRE-CREATION common/en/xml.dcl PRE-CREATION common/fdl-license.html 9ce378a common/fdl-notice.html 862f09e common/gpl-license.html 26ae3af common/kde-default.css 24ef928 common/kde-docs.css 12291a4 common/kde_logo.png 336bfd8 common/kde_logo_bg.png 6cf47f1 common/kmenu.png ff077c2 common/lgpl-license.html 343576d common/qpl-license.html 19a863b common/top-kde.jpg 48967d3 common/top-left.jpg 23c31c7 common/top-right.jpg 22d2a29 common/top.jpg 8be8caa common/x11-license.html 444a27b common/xml.dcl fed2103 src/CMakeLists.txt a2bb02b src/customization/kde-chunk.xsl eda3d38 Diff: https://git.reviewboard.kde.org/r/117781/diff/ Testing ------- - The files are installed under the common doc prefix - `kioclient cat help:/konsole/credits.html` shows the usage of the new prefix - `kioclient cat help:/kdoctools5-common/gpl-license.html` works Thanks, Luigi Toscano
_______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
