Hello community, here is the log from the commit of package kapidox for openSUSE:Factory checked in at 2016-07-16 22:13:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kapidox (Old) and /work/SRC/openSUSE:Factory/.kapidox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kapidox" Changes: -------- --- /work/SRC/openSUSE:Factory/kapidox/kapidox.changes 2016-06-21 12:29:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kapidox.new/kapidox.changes 2016-07-16 22:13:30.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 6 15:01:47 UTC 2016 - [email protected] + +- Update to 5.24.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.24.0.php + +------------------------------------------------------------------- Old: ---- kapidox-5.23.0.tar.xz New: ---- kapidox-5.24.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kapidox.spec ++++++ --- /var/tmp/diff_new_pack.Xsn1St/_old 2016-07-16 22:13:32.000000000 +0200 +++ /var/tmp/diff_new_pack.Xsn1St/_new 2016-07-16 22:13:32.000000000 +0200 @@ -16,9 +16,9 @@ # -%define _tar_path 5.23 +%define _tar_path 5.24 Name: kapidox -Version: 5.23.0 +Version: 5.24.0 Release: 0 Requires: doxygen BuildRequires: fdupes @@ -62,8 +62,6 @@ %{_kf5_mandir}/man1/depdiagram-generate-all.1* %{_kf5_mandir}/man1/depdiagram-generate.1* %{_kf5_mandir}/man1/depdiagram-prepare.1* -%{_kf5_mandir}/man1/kgenapidox.1* -%{_kf5_mandir}/man1/kgenframeworksapidox.1* %{python_sitelib}/kapidox/ %{python_sitelib}/kapidox-*.egg-info ++++++ kapidox-5.23.0.tar.xz -> kapidox-5.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/docs/kgenapidox.1 new/kapidox-5.24.0/docs/kgenapidox.1 --- old/kapidox-5.23.0/docs/kgenapidox.1 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/docs/kgenapidox.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ -\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.if \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "kgenapidox 1" -.TH kgenapidox 1 "2015-07-11" -.SH "NAME" -kgenapidox \- Generate API documentation in the KDE style -.SH "VERSION" -.IX Header "VERSION" -5\.13\.0 - -.SH "USAGE" -.IX Header "USAGE" - -usage: kgenapidox [\-h] [\-\-dependency\-diagram\-dir DEPENDENCY_DIAGRAM_DIR] - [\-\-title TITLE] [\-\-man-pages] [\-\-qhp] [\-\-searchengine] - [\-\-api-searchbox] [\-o OUTPUT] [\-\-qtdoc\-dir QTDOC_DIR] - [\-\-qtdoc\-link QTDOC_LINK] [\-\-qtdoc\-flatten\-links] - [\-\-kdedoc\-dir KDEDOC_DIR] [\-\-kdedoc\-link KDEDOC_LINK] - [\-\-doxygen DOXYGEN] [\-\-qhelpgenerator QHELPGENERATOR] - [\-\-doxdatadir DOXDATADIR] [\-\-keep\-temp\-dirs] - [moduledir] - -optional arguments: - \-h, \-\-help show this help message and exit - -sources: - moduledir Location of the module to build API documentation for; - it should contain a README.md file and a src/ - subdirectory.Defaults to the current folder. - \-\-dependency-diagram-dir DEPENDENCY_DIAGRAM_DIR - Location of framework diagram dirs; a "Dependencies" - page will be included in the framework documentation - if provided. - -output options: - \-\-title TITLE String to use for page titles. - \-\-man-pages Generate man page documentation. - \-\-qhp Generate Qt Compressed Help documentation. - \-\-searchengine Enable Doxygen's search engine feature. - \-\-api-searchbox Enable the API searchbox (only useful for - api.kde.org). - \-o OUTPUT, \-\-output OUTPUT - Location where the documentation will be generated. - Defaults to apidocs. - -Qt documentation: - \-\-qtdoc\-dir QTDOC_DIR - Location of (local) Qt documentation; this is searched - for tag files to create links to Qt classes. - \-\-qtdoc\-link QTDOC_LINK - Override Qt documentation location for the links in - the html files. May be a path or URL. - \-\-qtdoc\-flatten\-links - Whether to assume all Qt documentation html files are - immediately under QTDOC_LINK (useful if you set - QTDOC_LINK to the online Qt documentation). Ignored if - QTDOC_LINK is not set. - -KDE documentation: - \-\-kdedoc\-dir KDEDOC_DIR - Location of (local) KDE documentation; this is - searched for tag files to create links to KDE classes. - \-\-kdedoc\-link KDEDOC_LINK - Override KDE documentation location for the links in - the html files. May be a path or URL. - -paths: - \-\-doxygen DOXYGEN (Path to) the doxygen executable. - \-\-qhelpgenerator QHELPGENERATOR - (Path to) the qhelpgenerator executable. - -misc: - \-\-doxdatadir DOXDATADIR - Location of the HTML header files and support - graphics. - \-\-keep\-temp\-dirs Do not delete temporary dirs, useful for debugging. - -.SH "AUTHORS" -.IX Header "AUTHORS" -This version of \fBkapidox\fR was written by Aurélien Gâteau [email protected]. -.PP -This man-page was created by Scott Kitterman <[email protected]>. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/docs/kgenframeworksapidox.1 new/kapidox-5.24.0/docs/kgenframeworksapidox.1 --- old/kapidox-5.23.0/docs/kgenframeworksapidox.1 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/docs/kgenframeworksapidox.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,198 +0,0 @@ -\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.if \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "kgenframeworksapidox 1" -.TH kgenframeworksapidox 1 "2015-07-11" -.SH "NAME" -kgenframeworksapidox \- KDE API documentation generation tools -.SH "VERSION" -.IX Header "VERSION" -5\.13\.0 - -.SH "USAGE" -.IX Header "USAGE" - -usage: kgenframeworksapidox [\-h] [\-\-depdiagram\-dot\-dir DIR] [\-\-title TITLE] - [\-\-man-pages] [\-\-qhp] [\-\-searchengine] - [\-\-api\-searchbox] [\-\-qtdoc\-dir QTDOC_DIR] - [\-\-qtdoc\-link QTDOC_LINK] [\-\-qtdoc\-flatten\-links] - [\-\-doxygen DOXYGEN] - [\-\-qhelpgenerator QHELPGENERATOR] - [\-\-doxdatadir DOXDATADIR] [\-\-keep\-temp\-dirs] - frameworksdir - -Generate API documentation for the KDE Frameworks - -optional arguments: - \-h, \-\-help show this help message and exit - -sources: - frameworksdir Location of the frameworks modules. - \-\-depdiagram-dot-dir DIR - Generate dependency diagrams, using the .dot files - from DIR. - -output options: - \-\-title TITLE String to use for page titles. - \-\-man-pages Generate man page documentation. - \-\-qhp Generate Qt Compressed Help documentation. - \-\-searchengine Enable Doxygen's search engine feature. - \-\-api\-searchbox Enable the API searchbox (only useful for - api.kde.org). - -Qt documentation: - \-\-qtdoc-dir QTDOC_DIR - Location of (local) Qt documentation; this is searched - for tag files to create links to Qt classes. - \-\-qtdoc\-link QTDOC_LINK - Override Qt documentation location for the links in - the html files. May be a path or URL. - \-\-qtdoc\-flatten-links - Whether to assume all Qt documentation html files are - immediately under QTDOC_LINK (useful if you set - QTDOC_LINK to the online Qt documentation). Ignored if - QTDOC_LINK is not set. - -paths: - \-\-doxygen DOXYGEN (Path to) the doxygen executable. - \-\-qhelpgenerator QHELPGENERATOR - (Path to) the qhelpgenerator executable. - -misc: - \-\-doxdatadir DOXDATADIR - Location of the HTML header files and support - graphics. - \-\-keep\-temp\-dirs Do not delete temporary dirs, useful for debugging. - -.SH "AUTHORS" -.IX Header "AUTHORS" -This version of \fBkapidox\fR was written by Aurélien Gâteau [email protected]. -.PP -This man-page was created by Scott Kitterman <[email protected]>. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/metainfo.yaml new/kapidox-5.24.0/metainfo.yaml --- old/kapidox-5.23.0/metainfo.yaml 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/metainfo.yaml 2016-06-20 15:51:32.000000000 +0200 @@ -1,9 +1,11 @@ -maintainer: alexmerry +maintainer: ochurlaud description: Scripts and data for building API documentation (dox) in a standard format and style tier: 1 type: functional platforms: - - name: All + - name: Linux + - name: Windows + - name: MacOSX note: Python is required portingAid: false deprecated: false @@ -23,6 +25,7 @@ - Linux - Windows (partial) - MacOSX (partial) + - Android (partial) description: Providing everything from simple utility classes to integrated solutions for common requirements of desktop applications logo: konqi_frameworks.png long_description: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/setup.py new/kapidox-5.24.0/setup.py --- old/kapidox-5.23.0/setup.py 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/setup.py 2016-06-20 15:51:32.000000000 +0200 @@ -6,7 +6,7 @@ setup( name='kapidox', - version='5.23.0', + version='5.24.0', description='KDE API documentation generation tools', maintainer = 'Alex Merry', maintainer_email = '[email protected]', @@ -34,8 +34,7 @@ 'src/depdiagram-generate-all', ], data_files= [ - (os.path.join('share', 'man', 'man1'), ['docs/kgenapidox.1', - 'docs/kgenframeworksapidox.1', 'docs/depdiagram-prepare.1', + (os.path.join('share', 'man', 'man1'), ['docs/depdiagram-prepare.1', 'docs/depdiagram-generate.1', 'docs/depdiagram-generate-all.1'])], classifiers = [ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/block_title_bottom.png and new/kapidox-5.24.0/src/kapidox/data/htmlresource/block_title_bottom.png differ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/block_title_mid.png and new/kapidox-5.24.0/src/kapidox/data/htmlresource/block_title_mid.png differ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/block_title_top.png and new/kapidox-5.24.0/src/kapidox/data/htmlresource/block_title_top.png differ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/top-kde.jpg and new/kapidox-5.24.0/src/kapidox/data/htmlresource/top-kde.jpg differ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/top-left.jpg and new/kapidox-5.24.0/src/kapidox/data/htmlresource/top-left.jpg differ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/top-right.jpg and new/kapidox-5.24.0/src/kapidox/data/htmlresource/top-right.jpg differ Files old/kapidox-5.23.0/src/kapidox/data/htmlresource/top.jpg and new/kapidox-5.24.0/src/kapidox/data/htmlresource/top.jpg differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/src/kapidox/data/templates/base.html new/kapidox-5.24.0/src/kapidox/data/templates/base.html --- old/kapidox-5.23.0/src/kapidox/data/templates/base.html 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/src/kapidox/data/templates/base.html 2016-06-20 15:51:32.000000000 +0200 @@ -136,7 +136,7 @@ <div id="end_body"></div> <div id="footer"> <div id="footer_text"> - Report problems with this website to <a href="http://sysadmin.kde.org/tickets/";>our bug tracking system</a>.<br> + Report problems with this website to <a href="https://go.kde.org/u/systickets";>our bug tracking system</a>.<br> Contact the specific authors with questions and comments about the page contents.<p> KDE<sup>®</sup> and <a href="/media/images/kde_gear_black.png">the K Desktop Environment<sup>®</sup> logo</a> are registered trademarks of <a href="http://ev.kde.org/"; title="Homepage of the KDE non-profit Organization">KDE e.V.</a> | <a href="http://www.kde.org/contact/impressum.php";>Legal</a></p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/src/kapidox/data/templates/doxygen.html new/kapidox-5.24.0/src/kapidox/data/templates/doxygen.html --- old/kapidox-5.23.0/src/kapidox/data/templates/doxygen.html 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/src/kapidox/data/templates/doxygen.html 2016-06-20 15:51:32.000000000 +0200 @@ -26,7 +26,7 @@ <a href="http://www.doxygen.org/";>doxygen</a> {{ dox.doxygenversion }} written by <a href="mailto:[email protected]";>Dimitri van Heesch</a>, © 1997-2006 <p> - KDE's <a href="http://techbase.kde.org/Policies/Library_Documentation_Policy";>Doxygen guidelines</a> are available online. + KDE's <a href="http://community.kde.org/Policies/Library_Documentation_Policy";>Doxygen guidelines</a> are available online. </p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/src/kapidox/generator.py new/kapidox-5.24.0/src/kapidox/generator.py --- old/kapidox-5.23.0/src/kapidox/generator.py 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/src/kapidox/generator.py 2016-06-20 15:51:32.000000000 +0200 @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # +# Copyright 2016 Olivier Churlaud <[email protected]> # Copyright 2014 Alex Merry <[email protected]> # Copyright 2014 Aurélien Gâteau <[email protected]> # Copyright 2014 Alex Turbov <[email protected]> @@ -130,7 +131,7 @@ products.sort(key=lambda x: x['name'].lower()) mapping = { - 'resources': '.', + 'resources': './resources', 'api_searchbox': api_searchbox, # steal the doxygen css from one of the frameworks # this means that all the doxygen-provided images etc. will be found @@ -156,7 +157,7 @@ for group in groups: mapping = { - 'resources': '..', + 'resources': '../resources', 'api_searchbox': api_searchbox, # steal the doxygen css from one of the frameworks # this means that all the doxygen-provided images etc. will be found @@ -507,14 +508,17 @@ def generate_apidocs(ctx, tmp_dir, doxyfile_entries=None, keep_temp_dirs=False): """Generate the API documentation for a single directory""" - def find_src_subdir(d, deeper_subd=None): - pth = os.path.join(ctx.fwinfo['path'], d) - if deeper_subd is not None: - pth = os.path.join(pth, deeper_subd) - if os.path.isdir(pth) or os.path.isfile(pth) : - return [pth] - else: - return [] + def find_src_subdir(dirlist, deeper_subd=None): + returnlist = [] + for d in dirlist: + pth = os.path.join(ctx.fwinfo['path'], d) + if deeper_subd is not None: + pth = os.path.join(pth, deeper_subd) + if os.path.isdir(pth) or os.path.isfile(pth): + returnlist.append(pth) + else: + pass # We drop it + return returnlist # Paths and basic project info @@ -522,9 +526,13 @@ # What about providing the build directory? We could get the version # as well, then. - input_list = [ctx.fwinfo['path']+"/README.md"] - for srcdir in ctx.fwinfo['srcdirs']: - input_list.extend(find_src_subdir(srcdir)) + input_list = [] + if os.path.isfile(ctx.fwinfo['path']+"/README.md"): + input_list.append(ctx.fwinfo['path']+"/README.md") + if os.path.isfile(ctx.fwinfo['path']+"/Mainpage.dox"): + input_list.append(ctx.fwinfo['path']+"/Mainpage.dox") + + input_list.extend(find_src_subdir(ctx.fwinfo['srcdirs'])) input_list.extend(find_src_subdir(ctx.fwinfo['docdir'])) image_path_list = [] @@ -670,7 +678,8 @@ fancyname=lib['fancyname'], fwinfo=lib, # KApidox files - resourcedir='../..' if lib['parent'] is None else '../../..', + resourcedir=('../../resources' if lib['parent'] is None + else '../../../resources'), # Input #srcdir=lib['srcdir'], tagfiles=tagfiles, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/src/kapidox/preprocessing.py new/kapidox-5.24.0/src/kapidox/preprocessing.py --- old/kapidox-5.23.0/src/kapidox/preprocessing.py 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/src/kapidox/preprocessing.py 2016-06-20 15:51:32.000000000 +0200 @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- # # Copyright 2016 Olivier Churlaud <[email protected]> +# Copyright 2014 Alex Merry <[email protected]> +# Copyright 2014 Aurélien Gâteau <[email protected]> +# Copyright 2014 Alex Turbov <[email protected]> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -142,7 +145,7 @@ rootdir: (string) Top level directory containing the libraries Returns: - (list of dictionaries) a list of metainfo dictionary (see :any:`create_metainfo`) + A list of metainfo dictionary (see create_metainfo()) """ metalist = [] @@ -245,11 +248,16 @@ def extract_lib(metainfo, platforms, all_maintainers): + def tolist(a): + if type(a) is list: + return a + else: + return [a] + outputdir = metainfo.get('name') if 'group' in metainfo: outputdir = metainfo.get('group') + '/' + outputdir outputdir = utils.serialize_name(outputdir) - lib = { 'name': metainfo['name'], 'fancyname': metainfo['fancyname'], @@ -260,10 +268,10 @@ 'subgroup': utils.serialize_name(metainfo.get('subgroup'))}, 'href': '../'+outputdir.lower() + '/html/index.html', 'outputdir': outputdir.lower(), - 'path': metainfo['path'], - 'srcdirs': metainfo.get('public_source_dirs', ['src']), - 'docdir': metainfo.get('public_doc_dir', 'docs'), - 'exampledir': metainfo.get('public_example_dir', 'examples'), + 'path': metainfo['path'], + 'srcdirs': tolist(metainfo.get('public_source_dirs', ['src'])), + 'docdir': tolist(metainfo.get('public_doc_dir', ['docs'])), + 'exampledir': tolist(metainfo.get('public_example_dir', ['examples'])), 'dependency_diagram': None, 'type': metainfo.get('type', ''), 'portingAid': metainfo.get('portingAid', False), @@ -377,8 +385,7 @@ """ Expend the name of the maintainers. Args: - dictonary: (dict) Dictionary from which the name to expend will be - read. + dictonary: (dict) Dictionary from which the name to expend will be read. key: (string) Key of the dictionary where the name to expend is saved. maintainers: (list of dict) Look-up table where the names and emails of the maintainers are stored. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapidox-5.23.0/src/kapidox_generate new/kapidox-5.24.0/src/kapidox_generate --- old/kapidox-5.23.0/src/kapidox_generate 2016-06-06 08:51:11.000000000 +0200 +++ new/kapidox-5.24.0/src/kapidox_generate 2016-06-20 15:51:32.000000000 +0200 @@ -1,6 +1,7 @@ #! /usr/bin/env python # -*- coding: utf-8 -*- # +# Copyright 2016 Olivier Churlaud <[email protected]> # Copyright 2014 Alex Merry <[email protected]> # Copyright 2014 Aurélien Gâteau <[email protected]> # Copyright 2014 Alex Turbov <[email protected]> @@ -123,7 +124,12 @@ metalist = kdx.preprocessing.parse_tree(rootdir) products, groups, libraries, available_platforms = kdx.preprocessing.sort_metainfo(metalist, maintainers) - kdx.utils.copy_dir_contents(os.path.join(args.doxdatadir,'htmlresource'),'.') + dirsrc = os.path.join(args.doxdatadir, 'htmlresource') + dirdest = 'resources' + if os.path.isdir(dirdest): + shutil.rmtree(dirdest) + shutil.copytree(dirsrc, dirdest) + os.rename(dirdest+'/favicon.ico', './favicon.ico') kdx.generator.process_toplevel_html_file('index.html', args.doxdatadir,
