Review Request 128912: Import kcontrol docbooks for code in kio from kde-runtime master

[Burkhard Lück]

> On Sept. 15, 2016, 7:28 vorm., Luigi Toscano wrote:
> > 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
> 
> Burkhard Lück wrote:
>     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)
>     
>     Options for co-installable:
>     
>     1) append a "5" to every kcm docbook name
>     2) install every kcm docbook to SUBDIR kcontrol5
>     
>     Both options require mass renaming X-DocPath, CMakeLists.txt, translation catalogs etc.
>     
>     For kioslave docbooks we already use SUBDIR kioslave5, so we should use SUBDIR kcontrol5 to keep consistency

Regarding co-installable:

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

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)

Is this really a conflict in rpm based systems e.g. SuSe, RedHat ?


- Burkhard


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128912/#review99183
-----------------------------------------------------------


On Sept. 15, 2016, 9:09 vorm., Burkhard Lück wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/128912/
> -----------------------------------------------------------
> 
> (Updated Sept. 15, 2016, 9:09 vorm.)
> 
> 
> Review request for Documentation, KDE Frameworks and Plasma.
> 
> 
> Repository: kio
> 
> 
> Description
> -------
> 
> 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
> 
> Not included in build so far, the docbooks are imported as they were splitted
> 
> 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
> 
> 
> Diffs
> -----
> 
>   doc/kcontrol/cache/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/cache/index.docbook PRE-CREATION 
>   doc/kcontrol/cookies/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/cookies/index.docbook PRE-CREATION 
>   doc/kcontrol/ebrowsing/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/ebrowsing/index.docbook PRE-CREATION 
>   doc/kcontrol/netpref/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/netpref/index.docbook PRE-CREATION 
>   doc/kcontrol/proxy/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/proxy/index.docbook PRE-CREATION 
>   doc/kcontrol/smb/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/smb/index.docbook PRE-CREATION 
>   doc/kcontrol/useragent/CMakeLists.txt PRE-CREATION 
>   doc/kcontrol/useragent/index.docbook PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/128912/diff/
> 
> 
> Testing
> -------
> 
> history looks good, see git-log-doc-kcontrol.output, same log in kde-runtime master
> 
> 
> File Attachments
> ----------------
> 
> git-log-doc-kcontrol.output
>   https://git.reviewboard.kde.org/media/uploaded/files/2016/09/15/94d16f46-6d99-4597-b7a4-3ba4add1dee0__git-log-doc-kcontrol.output
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20161017/6e92d101/attachment.html>