<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/128912/">https://git.reviewboard.kde.org/r/128912/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On September 15th, 2016, 7:28 vorm. UTC, <b>Luigi Toscano</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Can they be made co-installable with the ones with kde-runtime, as both modules can be available at the same time? This is the problem of the missing support for kcontrol5
It was already done some time ago and I had to revert it:
https://marc.info/?t=142074540300007&r=1&w=1
https://marc.info/?l=kde-i18n-doc&m=142076318528227&w=1</pre>
</blockquote>
<p>On September 15th, 2016, 9:06 vorm. UTC, <b>Burkhard Lück</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Sure we can make them co-installable, we just need to decide how to do it
so far in kf5 we install to ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/ = same subdir as kde4/kde-runtime
all kcontrol docbooks have the same name in kf5 + kde4 except for cddbretrieval (kde4) / cddbretrieval5 (kf5) and ebrowsing (kde4) / webshortcuts (kf5)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Options for co-installable:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">1) append a "5" to every kcm docbook name
2) install every kcm docbook to SUBDIR kcontrol5</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Both options require mass renaming X-DocPath, CMakeLists.txt, translation catalogs etc.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">For kioslave docbooks we already use SUBDIR kioslave5, so we should use SUBDIR kcontrol5 to keep consistency</p></pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Regarding co-installable:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">frameworks/kdelibs4support has docs/kcontrol/kcm_ssl/index.docbook since 5.0.0
debian testing (stretch) and ubuntu 16.10 (yakkety) install kcm_ssl/index.docbook in
/usr/share/doc/kde/HTML/en/kcontrol/ from package kde-runtime-data
and
/usr/share/doc/HTML/en/kcontrol/ from package libkf5kdelibs4support-data
i.e. distinguished using an additional subdir "kde" in the install path from package kde-runtime-data</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">So we have apparently no conflict in debian based distributions and apparently no conflict in builds from sources (no one complained since frameworks 5.0.0)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Is this really a conflict in rpm based systems e.g. SuSe, RedHat ?</p></pre>
<br />
<p>- Burkhard</p>
<br />
<p>On September 15th, 2016, 9:09 vorm. UTC, Burkhard Lück wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: 1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
<div>Review request for Documentation, KDE Frameworks and Plasma.</div>
<div>By Burkhard Lück.</div>
<p style="color: grey;"><i>Updated Sept. 15, 2016, 9:09 vorm.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kio
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">doc/kcontrol/cache doc/kcontrol/proxy doc/kcontrol/useragent doc/kcontrol/cookies/ doc/kcontrol/useragent/ doc/kcontrol/netpref/ doc/kcontrol/ebrowsing/ doc/kcontrol/smb/
splitted from kde-runtime master using https://github.com/ajdruff/git-splits</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Not included in build so far, the docbooks are imported as they were splitted</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">To be done next:
Move to existing subdir docs, adapt CMakeLists.txt, change dtd to kf5,
rename ebrowsing to webshortcuts
reapply a few updates done in plasma-desktop
remove these imported kcontrol docbooks from plasma-desktop
adapt scripty to these changes</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime master</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>doc/kcontrol/cache/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/cache/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/cookies/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/cookies/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/ebrowsing/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/ebrowsing/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/netpref/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/netpref/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/proxy/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/proxy/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/smb/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/smb/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/useragent/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>doc/kcontrol/useragent/index.docbook <span style="color: grey">(PRE-CREATION)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/128912/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments </h1>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output">git-log-doc-kcontrol.output</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>