Hello community, here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2018-04-19 15:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdoctools" Thu Apr 19 15:15:59 2018 rev:54 rq:596867 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2018-03-20 21:45:23.582016479 +0100 +++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2018-04-19 15:16:01.811644386 +0200 @@ -1,0 +2,17 @@ +Sat Apr 14 13:19:03 CEST 2018 - lbeltr...@kde.org + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Add entities for Elisa, Markdown, KParts, DOT, SVG to general.entities + * customization/ru: Fix translation of underCCBYSA4.docbook and underFDL.docbook + * Fix duplicate lgpl-notice/gpl-notice/fdl-notice + * customization/ru: Translate fdl-notice.docbook + * change spelling of kwave requested by the maintainer + * Remove not necessary QtCore and co +- Don't mark /usr/share/doc/HTML*/kdoctools5-common as %doc, + they're files needed to display help properly (boo#1088562) + +------------------------------------------------------------------- Old: ---- kdoctools-5.44.0.tar.xz New: ---- kdoctools-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.ByLiw7/_old 2018-04-19 15:16:02.779605928 +0200 +++ /var/tmp/diff_new_pack.ByLiw7/_new 2018-04-19 15:16:02.783605769 +0200 @@ -18,13 +18,13 @@ %bcond_without lang %define lname libKF5DocTools5 -%define _tar_path 5.44 +%define _tar_path 5.45 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kdoctools -Version: 5.44.0 +Version: 5.45.0 Release: 0 %define kf5_version %{version} Summary: Create documentation from DocBook @@ -107,7 +107,7 @@ %files %defattr(-,root,root) %doc COPYING* README* LICENSE -%doc %{_kf5_htmldir}/*/ +%{_kf5_htmldir}/*/ %{_kf5_datadir}/kdoctools/ %{_kf5_bindir}/meinproc5 %{_kf5_bindir}/checkXML5 ++++++ kdoctools-5.44.0.tar.xz -> kdoctools-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/CMakeLists.txt new/kdoctools-5.45.0/CMakeLists.txt --- old/kdoctools-5.44.0/CMakeLists.txt 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/CMakeLists.txt 2018-04-07 21:35:07.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts -set(KF5_DEP_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts +set(KF5_DEP_VERSION "5.45.0") # handled by release scripts project(KDocTools VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.44.0 NO_MODULE) +find_package(ECM 5.45.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -28,7 +28,7 @@ option(INSTALL_INTERNAL_TOOLS "Install internal tools too." OFF) # Dependencies -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/po/de/docs/kf5options/man-kf5options.7.docbook new/kdoctools-5.45.0/po/de/docs/kf5options/man-kf5options.7.docbook --- old/kdoctools-5.44.0/po/de/docs/kf5options/man-kf5options.7.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/po/de/docs/kf5options/man-kf5options.7.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -133,7 +133,9 @@ ><para >Der Basis-Dateiname des Desktop-Eintrags dieser Anwendung.</para> <para ->Dies ist besonders nützlich für Wrapper-Anwendungen und Anwendungen. die mehrere Desktop-Dateien haben. So kann jede Desktop-Datei ihren eigenen Namen in den exec-Befehl einfügen. </para +>Dies ist besonders nützlich für Wrapper-Anwendungen und Anwendungen. die mehrere Desktop-Dateien haben. So kann jede Desktop-Datei ihre eigene Befehlszeile für den Eintrag <option +>Exec</option +> verwenden. </para ></listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/po/de/docs/qt5options/man-qt5options.7.docbook new/kdoctools-5.45.0/po/de/docs/qt5options/man-qt5options.7.docbook --- old/kdoctools-5.44.0/po/de/docs/qt5options/man-qt5options.7.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/po/de/docs/qt5options/man-qt5options.7.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -6,13 +6,15 @@ <refentry lang="&language;"> <refentryinfo> <title ->qt5options-Benutzerhandbuch</title> +>Qt-Befehlszeilendokumentation</title> <author >&Lauri.Watts; &Lauri.Watts.mail;</author> +<author +>&Burkhard.Lueck; &Burkhard.Lueck.mail;</author> <date ->2014-03-04</date> +>2016-06-04</date> <releaseinfo ->Frameworks 5.0</releaseinfo> +>&Qt; 5.4</releaseinfo> <productname >KDE Frameworks</productname> </refentryinfo> @@ -35,10 +37,126 @@ <cmdsynopsis ><command ><replaceable ->Qt-Anwendung</replaceable +>Qt application</replaceable ></command > <arg choice="opt" ->Allgemeine Qt-Optionen</arg +><option +>-style=</option +> <replaceable +>style</replaceable +> / <option +>-style</option +> <replaceable +>style</replaceable +></arg +> <arg choice="opt" +><option +>-stylesheet=</option +> <replaceable +>stylesheet</replaceable +> / <option +>-stylesheet</option +> <replaceable +>stylesheet</replaceable +></arg +> <arg choice="opt" +><option +>-widgetcount</option +></arg +> <arg choice="opt" +><option +>-reverse</option +></arg +> <arg choice="opt" +><option +>-qmljsdebugger=</option +> <replaceable +>port</replaceable +></arg +> <arg choice="opt" +><option +>-platform</option +> <replaceable +>platformName[:options]</replaceable +></arg +> <arg choice="opt" +><option +>-platformpluginpath</option +> <replaceable +>path</replaceable +></arg +> <arg choice="opt" +><option +>-platformtheme</option +> <replaceable +>platformTheme</replaceable +></arg +> <arg choice="opt" +><option +>-plugin</option +> <replaceable +>plugin</replaceable +></arg +> <arg choice="opt" +><option +>-qwindowgeometry</option +> <replaceable +>geometry</replaceable +></arg +> <arg choice="opt" +><option +>-qwindowicon</option +> <replaceable +>icon</replaceable +></arg +> <arg choice="opt" +><option +>-qwindowtitle</option +> <replaceable +>title</replaceable +></arg +> <arg choice="opt" +><option +>-reverse</option +></arg +> <arg choice="opt" +><option +>-session</option +> <replaceable +>session</replaceable +></arg +> <arg choice="opt" +><option +>-display</option +> <replaceable +>hostname:screen_number</replaceable +></arg +> <arg choice="opt" +><option +>-geometry</option +> <replaceable +>geometry</replaceable +></arg +> <arg choice="opt" +><option +>-dialogs=</option +> <replaceable +>[xp|none]</replaceable +></arg +> <arg choice="opt" +><option +>-fontengine=</option +> <replaceable +>freetype</replaceable +></arg +> <arg choice="opt" +><option +>-h, --help and -? on Windows</option +></arg +> <arg choice="opt" +><option +>-v --version</option +></arg > </cmdsynopsis> </refsynopsisdiv> @@ -50,271 +168,258 @@ <para >Die folgenden Parameter gelten für alle &Qt;-Anwendungen:</para> -<variablelist -> <!-- all this could be entitiesan entity --> +<variablelist> +<!--http://doc.qt.io/qt-5/qapplication.html#QApplication--> <varlistentry> <term ><option ->--display</option -> <parameter ->Displayname</parameter +>-style=</option +> <replaceable +>style</replaceable +> / <option +>-style</option +> <replaceable +>style</replaceable > </term> -<listitem> -<para ->Verwende den X-Server-Display <parameter ->Displayname</parameter ->.</para> +<listitem +><para +>Legt den GUI-Stil der Anwendung fest. Mögliche Werte hängen von der Einstellung des Systems ab. Wurde Qt mit zusätzlichen Stielen kompiliert oder gibt es zusätzliche Stile als Module, können diese als Argumente für die Option „-style“ der Befehlszeile verwendet werden.</para> </listitem> </varlistentry> <varlistentry> <term ><option ->--session</option -> <parameter ->Sitzungs-ID</parameter +>-stylesheet=</option +> <replaceable +>stylesheet</replaceable +> / <option +>-stylesheet</option +> <replaceable +>stylesheet</replaceable > </term> -<listitem> -<para ->Wiederherstellung der Anwendung für die angegebene <parameter ->Sitzungs-ID</parameter ->.</para> -</listitem> +<listitem +><para +>Legt die Stilvorlage der Anwendung fest. Als Wert muss ein Pfad zu einer Datei mit dem Stile angegeben werden. </para +></listitem> </varlistentry> <varlistentry> <term> <option ->--cmap</option> +>-widgetcount</option> </term> -<listitem> -<para ->Bewirkt, dass die Anwendung auf einem 8-Bit-Display eine eigene Farbtabelle anlegt. </para> -</listitem> +<listitem +><para +>Gibt am Ende eine Fehlermeldung mit der Anzahl der nicht freigegebenen Bedienelemente sowie die gesamte Anzahl der zu diesem Zeitpunkt existierenden Bedienelemente aus. </para +></listitem> +</varlistentry> + +<varlistentry> +<term> +<option +>-reverse</option> +</term> +<listitem +><para +>Legt die Richtung des Layouts der Anwendung auf <methodname +>Qt::RightToLeft</methodname +> fest. Diese Option ist nur für die Fehlersuche gedacht und sollte normalerweise nicht verwendet werden. Der Standardwert wird automatisch aus der Spracheinstellung des Benutzers ermittelt, siehe auch <methodname +>QLocale::textDirection()</methodname +>. </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--ncols</option -> <parameter ->Anzahl</parameter +>-qmljsdebugger=</option +> <replaceable +>port</replaceable > </term> -<listitem> -<para ->Beschränkt die Anzahl der Farben auf einem 8-Bit-Display, wenn die Anwendung die Farbspezifikation <methodname ->QApplication::ManyColor</methodname -> verwendet.</para> -</listitem> +<listitem +><para +>Aktiviert den QML/JS-Debugger mit dem angegebenen Port. Der Wert muss im Format „port:1234[,block]“ angeben werden, dabei ist „block“ optional. Mit „block“ wartet eine Anwendung auf eine Verbindung zu einem Debugger. </para +></listitem> </varlistentry> - +<!--http://doc.qt.io/qt-5/qguiapplication.html#QGuiApplication--> <varlistentry> -<term> -<option ->--nograb</option> -</term> -<listitem> -<para ->Bewirkt, dass &Qt; weder Maus noch Tastatur für sich allein beansprucht (grab).</para> -</listitem> +<term +><option +>-platform</option +> <replaceable +>platformName[:options]</replaceable +> </term> +<listitem +><para +>Gibt das QPA-Modul (Qt Platform Abstraction) an. </para +></listitem> </varlistentry> <varlistentry> -<term> -<option ->--dograb</option> -</term> -<listitem> -<para ->In einem Debugger kann es vorkommen, dass implizit der Parameter <option ->--nograb</option -> gesetzt ist. Verwenden Sie <option ->--dograb</option ->, um diese Einstellung zu überschreiben.</para> -</listitem> +<term +><option +>-platformpluginpath</option +> <replaceable +>path</replaceable +> </term> +<listitem +><para +>Gibt den Pfad zu den Plattformmodulen an. </para +></listitem> </varlistentry> <varlistentry> -<term> -<option ->--sync</option> -</term> -<listitem> -<para ->Wechselt zum Debuggen in den Synchronmodus.</para> -</listitem> +<term +><option +>-platformtheme</option +> <replaceable +>platformTheme</replaceable +> </term> +<listitem +><para +>Legt das Design der Plattform fest. </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--fn</option ->,<option ->--font</option -> <parameter ->Schriftname</parameter +>-plugin</option +> <replaceable +>plugin</replaceable > </term> -<listitem> -<para ->Legt die Schriftart für die Anwendung fest.</para> -</listitem> +<listitem +><para +>Gibt zusätzlich zu ladende Module an. Dieses Argument kann mehrfach verwendet werden. </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--bg</option ->,<option ->--background</option -> <parameter ->Farbe</parameter +>-qwindowgeometry</option +> <replaceable +>geometry</replaceable > </term> -<listitem> -<para ->Legt die Standardhintergrundfarbe und eine Farbpalette für die Anwendung fest (helle und dunkle Schattierungen werden berechnet).</para> -</listitem> +<listitem +><para +>Gibt die Geometrie des Hauptfensters für X11-Systeme am, zum Beispiel geometry x100+50+50 </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--fg</option ->,<option ->--foreground</option -> <parameter ->Farbe</parameter +>-qwindowicon</option +> <replaceable +>icon</replaceable > </term> -<listitem> -<para ->Legt die Standardvordergrundfarbe fest.</para> -</listitem> +<listitem +><para +>Legt die Standardsymbol des Fensters fest. </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--btn</option ->,<option ->--button</option -> <parameter ->Farbe</parameter +>-qwindowtitle</option +> <replaceable +>title</replaceable > </term> -<listitem> -<para ->Legt die Standardfarbe für Knöpfe fest.</para> -</listitem> +<listitem +><para +>Legt den Titel des ersten Fensters fest. </para +></listitem> </varlistentry> - <varlistentry> <term ><option ->--name</option -> <parameter ->Name</parameter +>-session</option +> <replaceable +>session</replaceable > </term> -<listitem> -<para ->Legt den Namen der Anwendung fest</para> -</listitem> +<listitem +><para +>Wiederherstellung der Anwendung von einer früheren Sitzung. </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--title</option -> <parameter ->Titel</parameter +>-display</option +> <replaceable +>hostname:screen_number</replaceable > </term> -<listitem> -<para ->Legt den Titel der Anwendung fest (Fenstertitel)</para> -</listitem> +<listitem +><para +>Wechselt die Anzeige auf X11-Systemen. Überschreibt die Umgebungsvariable „DISPLAY“. </para +></listitem> </varlistentry> <varlistentry> <term ><option ->--visual</option -> <parameter ->TrueColor</parameter +>-geometry</option +> <replaceable +>geometry</replaceable > </term> -<listitem> -<para ->Erzwingt für die Anwendung eine <parameter ->TrueColore</parameter ->-Darstellung auf einem 8-Bit-Display.</para> -</listitem> +<listitem +><para +>Gibt die Geometrie des Hauptfensters für X11-Systeme am, zum Beispiel geometry 100x100+50+50. </para +></listitem> </varlistentry> - <varlistentry> <term ><option ->--inputstyle</option -> <parameter ->Eingabestil</parameter +>-dialogs=</option +> <replaceable +>[xp|none]</replaceable > </term> -<listitem> -<para ->Legt den XIM (X Input Method) Eingabestil fest. Mögliche Werte sind <parameter ->onthespot</parameter ->, <parameter ->overthespot</parameter ->, <parameter ->offthespot</parameter -> und <parameter ->root</parameter ->.</para> -</listitem> +<listitem +><para +>Nur verfügbar für „-platform windows“. Mit „xp“ werden die nativen Dialoge im XP-Stile verwendet, mit „none“ werden sie ausgeschaltet.</para +></listitem> </varlistentry> <varlistentry> <term ><option ->--im</option -> <parameter ->XIM-Server</parameter +>-fontengine=</option +> <replaceable +>freetype</replaceable > </term> -<listitem> -<para ->Legt den XIM-Server fest.</para> -</listitem> +<listitem +><para +>Verwendet das FreeType-schriftmodul. </para +></listitem> </varlistentry> +<!--http://doc.qt.io/qt-5/qcommandlineparser.html --> <varlistentry> <term> <option ->--noxim</option> +>-h, --help und -? unter Windows</option> </term> -<listitem> -<para ->XIM abschalten</para> -</listitem> +<listitem +><para +>Zeigt alle Optionen und eine Beschreibung der Anwendung an. </para +></listitem> </varlistentry> <varlistentry> <term> <option ->--reverse</option> +>-v --version</option> </term> -<listitem> -<para ->Ordnet sämtliche Bedienelemente spiegelverkehrt an</para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><option ->--stylesheet</option -> <replaceable ->file.qss</replaceable -> </term> -<listitem> -<para ->Wendet die Qt-Stilvorlage auf Anwendungs-Dialoge an.</para> -</listitem> +<listitem +><para +>Zeigt die Version der Anwendung an. </para +></listitem> </varlistentry> </variablelist> @@ -336,7 +441,17 @@ <title >Autoren</title> <para ->Handbuchseite geschrieben von &Lauri.Watts;&Lauri.Watts.mail;</para> +>Die Handbuchseite wurde ursprünglich von &Lauri.Watts;&Lauri.Watts.mail; geschrieben</para> +<para +>Aktualisierung für Frameworks 5 durch &Burkhard.Lueck; &Burkhard.Lueck.mail;</para> +<para +>Die Informationen dieser Handbuchseite stammen von der <ulink url="http://doc.qt.io/qt-5/qapplication.html#QApplication"; +>QApplication-Dokumentation</ulink +>, der <ulink url="http://doc.qt.io/qt-5/qguiapplication.html#QGuiApplication"; +>QGuiApplication-Dokumentation</ulink +> und der <ulink url="http://doc.qt.io/qt-5/qcommandlineparser.html"; +>QCommandLineParser-Dokumentation</ulink +>.</para> </refsect1> </refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/po/zh_CN/kdoctools5.po new/kdoctools-5.45.0/po/zh_CN/kdoctools5.po --- old/kdoctools-5.44.0/po/zh_CN/kdoctools5.po 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/po/zh_CN/kdoctools5.po 2018-04-07 21:35:07.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-04 03:56+0100\n" -"PO-Revision-Date: 2018-02-28 02:23-0500\n" +"PO-Revision-Date: 2018-04-05 09:22-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/en/entities/gpl-notice.docbook new/kdoctools-5.45.0/src/customization/en/entities/gpl-notice.docbook --- old/kdoctools-5.44.0/src/customization/en/entities/gpl-notice.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/en/entities/gpl-notice.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -1,53 +1,32 @@ <!-- This file can be used to include the notice in documentation - <!DOCTYPE book ... [ - <!ENTITY % FDLIS "INCLUDE"> - <!ENTITY FDLISTitles "title 1, title 2, title 3"> - <!ENTITY % FDLFCT "INCLUDE"> - <!ENTITY FDLFCTTitles "title 4, title 5, title 6"> - <!ENTITY % FDLBCT "INCLUDE"> - <!ENTITY FDLBCTTitles "title 7, title 7b"> - <!ENTITY % ents "-//KDE//ENTITIES Application-Variable Entities V1.0//EN"> - %ents; - ... - ]> + <!DOCTYPE book ... > ... <bookinfo> <legalnotice> <para>Copyright (C) 20yy [name of author]</para> - &FDLnotice; + &GPLnotice; </legalnotice> </bookinfo> ... Alternatively, you can include the text literally. - - Include a copy of the license in the documentation distribution. --> -<para>Permission is granted to copy, distribute and/or modify this -document under the terms of the GNU Free Documentation License, -Version 1.2 or any later version published by the Free Software -Foundation; with &FDLInvariantSections;, with &FDLFrontCoverText;, and -with &FDLBackCoverText;. A copy of the license is included in <xref linkend="gnu-fdl"/>.</para> +<para>This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version.</para> -<!-- If you have no Invariant Sections, don't add any FDLIS entities. - If you have no Front-Cover Texts, don't add any FDLFCT; likewise - for Back-Cover Texts (the SGML setup takes care of complying with - the GNU requirements). Adding the entities: if you use any, then - add FDL* with value "INCLUDE" and FDL*Titles with a list of - titles. You will get the default GNU template text if you don't - specify the FDL*Titles entity after specifying the FDL* entity. - This will only have effect when you specify %FDLSlots; _after_ - the entity definitions. +<para>This program is distributed in the hope that it will be +useful, but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details.</para> - If your document contains nontrivial examples of program code, we - recommend releasing these examples in parallel under your choice - of free software license, such as the GNU General Public License, - to permit their use in free software. - --> +<para>You should have received a copy of the GNU General Public +License along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</para> <!-- Local variables: mode: sgml sgml-general-insert-case: lower -sgml-parent-document: ("index.docbook" "book" "bookinfo" "legalnotice" "para") End: --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/en/entities/lgpl-notice.docbook new/kdoctools-5.45.0/src/customization/en/entities/lgpl-notice.docbook --- old/kdoctools-5.44.0/src/customization/en/entities/lgpl-notice.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/en/entities/lgpl-notice.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -1,53 +1,33 @@ <!-- This file can be used to include the notice in documentation - <!DOCTYPE book ... [ - <!ENTITY % FDLIS "INCLUDE"> - <!ENTITY FDLISTitles "title 1, title 2, title 3"> - <!ENTITY % FDLFCT "INCLUDE"> - <!ENTITY FDLFCTTitles "title 4, title 5, title 6"> - <!ENTITY % FDLBCT "INCLUDE"> - <!ENTITY FDLBCTTitles "title 7, title 7b"> - <!ENTITY % ents "-//KDE//ENTITIES Application-Variable Entities V1.0//EN"> - %ents; - ... - ]> + <!DOCTYPE book ... > ... <bookinfo> <legalnotice> <para>Copyright (C) 20yy [name of author]</para> - &FDLnotice; + &LGPLnotice; </legalnotice> </bookinfo> ... Alternatively, you can include the text literally. - - Include a copy of the license in the documentation distribution. --> -<para>Permission is granted to copy, distribute and/or modify this -document under the terms of the GNU Free Documentation License, -Version 1.2 or any later version published by the Free Software -Foundation; with &FDLInvariantSections;, with &FDLFrontCoverText;, and -with &FDLBackCoverText;. A copy of the license is included in <xref linkend="gnu-fdl"/>.</para> +<para>This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2 of +the License, or (at your option) any later version.</para> -<!-- If you have no Invariant Sections, don't add any FDLIS entities. - If you have no Front-Cover Texts, don't add any FDLFCT; likewise - for Back-Cover Texts (the SGML setup takes care of complying with - the GNU requirements). Adding the entities: if you use any, then - add FDL* with value "INCLUDE" and FDL*Titles with a list of - titles. You will get the default GNU template text if you don't - specify the FDL*Titles entity after specifying the FDL* entity. - This will only have effect when you specify %FDLSlots; _after_ - the entity definitions. +<para>This library is distributed in the hope that it will be +useful, but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details.</para> - If your document contains nontrivial examples of program code, we - recommend releasing these examples in parallel under your choice - of free software license, such as the GNU General Public License, - to permit their use in free software. - --> +<para>You should have received a copy of the GNU Lesser General +Public License along with this library; if not, write to the Free +Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA</para> <!-- Local variables: mode: sgml sgml-general-insert-case: lower -sgml-parent-document: ("index.docbook" "book" "bookinfo" "legalnotice" "para") End: --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/entities/general.entities new/kdoctools-5.45.0/src/customization/entities/general.entities --- old/kdoctools-5.44.0/src/customization/entities/general.entities 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/entities/general.entities 2018-04-07 21:35:07.000000000 +0200 @@ -134,6 +134,7 @@ <!ENTITY CUPS "<acronym>CUPS</acronym>"> <!ENTITY DBus "<acronym>D-Bus</acronym>"> <!ENTITY Debian '<acronym><trademark class="registered">Debian</trademark></acronym>'> +<!ENTITY DOT "<acronym>DOT</acronym>"> <!ENTITY DVD "<acronym>DVD</acronym>"> <!ENTITY digikam "<application>digiKam</application>"> <!ENTITY dolphin "<application>Dolphin</application>"> @@ -141,6 +142,7 @@ <!ENTITY drkonqi "<application>DrKonqi</application>"> <!ENTITY DVI "<acronym>DVI</acronym>"> <!ENTITY ELF "<acronym>ELF</acronym>"> +<!ENTITY elisa "<application>Elisa</application>"> <!ENTITY Emacs "<application>Emacs</application>"> <!ENTITY Flash "<trademark>Flash</trademark>"> <!ENTITY filelight "<application>Filelight</application>"> @@ -304,6 +306,7 @@ <!ENTITY kpackage "<application>KPackage</application>"> <!ENTITY kpager "<application>KPager</application>"> <!ENTITY kpaint "<application>KPaint</application>"> +<!ENTITY kparts "<acronym>KParts<acronym>"> <!ENTITY kpatience "<application>KPatience</application>"> <!ENTITY kpercentage "<application>KPercentage</application>"> <!ENTITY kpilot "<application>KPilot</application>"> @@ -369,7 +372,7 @@ <!ENTITY kwallet5 "<application>KWallet</application>"> <!ENTITY kwalletmanager5 "<application>KWallet Manager</application>"> <!ENTITY kwatchgnupg "<application>KWatchGnuPG</application>"> -<!ENTITY kwave "<application>KWave</application>"> +<!ENTITY kwave "<application>Kwave</application>"> <!ENTITY kworldclock "<application>KWorldClock</application>"> <!ENTITY kwin "<application>KWin</application>"> <!ENTITY kwordquiz "<application>KWordQuiz</application>"> @@ -388,6 +391,7 @@ <!ENTITY Mac '<trademark class="registered">Mac</trademark>'> <!ENTITY MacOS '<trademark class="registered">Mac</trademark> <acronym>OS</acronym>'> <!ENTITY marble "<application>Marble</application>"> +<!ENTITY Markdown "<acronym>Markdown</acronym>"> <!ENTITY megami "<application>Megami</application>"> <!ENTITY Microsoft '<trademark class="registered">Microsoft</trademark>'> <!ENTITY MIDI "<acronym>MIDI</acronym>"> @@ -434,6 +438,7 @@ <!ENTITY step "<application>Step</application>"> <!ENTITY superkaramba "<application>SuperKaramba</application>"> <!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'> +<!ENTITY SVG "<acronym>SVG</acronym>"> <!ENTITY sweeper "<application>Sweeper</application>"> <!ENTITY symboleditor '<application>SymbolEditor</application>'> <!ENTITY tellico '<application>Tellico</application>'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/ru/entities/fdl-notice.docbook new/kdoctools-5.45.0/src/customization/ru/entities/fdl-notice.docbook --- old/kdoctools-5.44.0/src/customization/ru/entities/fdl-notice.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/ru/entities/fdl-notice.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -23,11 +23,13 @@ Include a copy of the license in the documentation distribution. --> -<para>Permission is granted to copy, distribute and/or modify this -document under the terms of the GNU Free Documentation License, -Version 1.2 or any later version published by the Free Software -Foundation; with &FDLInvariantSections;, with &FDLFrontCoverText;, and -with &FDLBackCoverText;. A copy of the license is included in <xref linkend="gnu-fdl"/>.</para> +<para> +Вам даётся право копировать, распространять и/или модифицировать этот документ +на условиях Лицензии свободной документации GNU версии 1.2 или любой более +поздней версии этой лицензии, опубликованной Фондом свободного программного +обеспечения; &FDLInvariantSections;, &FDLFrontCoverText; и &FDLBackCoverText;. +Копия лицензии находится по ссылке <xref linkend="gnu-fdl"/>. +</para> <!-- If you have no Invariant Sections, don't add any FDLIS entities. If you have no Front-Cover Texts, don't add any FDLFCT; likewise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/ru/entities/underCCBYSA4.docbook new/kdoctools-5.45.0/src/customization/ru/entities/underCCBYSA4.docbook --- old/kdoctools-5.44.0/src/customization/ru/entities/underCCBYSA4.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/ru/entities/underCCBYSA4.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -1,3 +1,3 @@ -<para id="cc-by-sa-4" xreflabel="the credits and license section">Этот документ распространяется на -условиях лицензии <ulink type="commondoc" url="ccbysa4-license.html">Creative -Commons Attribution-ShareAlike 4.0 International</ulink>.</para> +<para id="cc-by-sa-4" xreflabel="CC BY-SA 4.0">Этот документ распространяется +на условиях лицензии <ulink type="commondoc" url="ccbysa4-license.html"> +Creative Commons Attribution-ShareAlike 4.0 International</ulink>.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/ru/entities/underFDL.docbook new/kdoctools-5.45.0/src/customization/ru/entities/underFDL.docbook --- old/kdoctools-5.44.0/src/customization/ru/entities/underFDL.docbook 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/ru/entities/underFDL.docbook 2018-04-07 21:35:07.000000000 +0200 @@ -1,4 +1,3 @@ -<para id="gnu-fdl" xreflabel="the section entitled "GNU Free Documentation -License"">Этот документ распространяется на условиях <ulink -type="commondoc" url="fdl-license.html">GNU Free Documentation -License</ulink>.</para> +<para id="gnu-fdl" xreflabel="GNU Free Documentation License">Этот документ +распространяется на условиях <ulink type="commondoc" url="fdl-license.html">GNU +Free Documentation License</ulink>.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/customization/ru/strings.entities new/kdoctools-5.45.0/src/customization/ru/strings.entities --- old/kdoctools-5.44.0/src/customization/ru/strings.entities 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/customization/ru/strings.entities 2018-04-07 21:35:07.000000000 +0200 @@ -8,19 +8,19 @@ The default values of the parameter entities is IGNORE. --> <![%FDLIS;[ <!ENTITY FDLISTitles "ПЕРЕЧИСЛИТЬ ИХ НАЗВАНИЯ"><!-- keep capitals --> -<!ENTITY FDLInvariantSections "неизменяемые разделы: &FDLISTitles;"> +<!ENTITY FDLInvariantSections "с неизменяемыми разделами: &FDLISTitles;"> ]]> -<!ENTITY FDLInvariantSections " неизменямых разделов"> +<!ENTITY FDLInvariantSections "без неизменяемых разделов"> <![%FDLFCT;[ <!ENTITY FDLFCTTitles "LIST"><!-- keep capitals --> -<!ENTITY FDLFrontCoverText "текст на первой странице: &FDLFCTTitles;"> +<!ENTITY FDLFrontCoverText "с текстом для передней стороны обложки: &FDLFCTTitles;"> ]]> -<!ENTITY FDLFrontCoverText " текста на первой странице"> +<!ENTITY FDLFrontCoverText "без текста для передней стороны обложки"> <![%FDLBCT;[ <!ENTITY FDLBCTTitles "ПЕРЕЧИСЛИТЬ ИХ НАЗВАНИЯ"><!-- keep capitals --> -<!ENTITY FDLBackCoverText "текст на последней странице: &FDLBCTTitles;"> +<!ENTITY FDLBackCoverText "с текстом для задней стороны обложки: &FDLBCTTitles;"> ]]> -<!ENTITY FDLBackCoverText " текста на последней странице"> +<!ENTITY FDLBackCoverText "без текста для задней стороны обложки"> <!-- modespec entity: must be adapted in accordance with the normal usage for documents in a language; the most likely candidates are the value diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/meinproc.cpp new/kdoctools-5.45.0/src/meinproc.cpp --- old/kdoctools-5.44.0/src/meinproc.cpp 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/meinproc.cpp 2018-04-07 21:35:07.000000000 +0200 @@ -6,13 +6,13 @@ #include "loggingcategory.h" #include <QCoreApplication> -#include <QtCore/QDebug> -#include <QtCore/QString> -#include <QtCore/QFile> -#include <QtCore/QDir> -#include <QtCore/QTextCodec> -#include <QtCore/QFileInfo> -#include <QtCore/QList> +#include <QDebug> +#include <QString> +#include <QFile> +#include <QDir> +#include <QTextCodec> +#include <QFileInfo> +#include <QList> #include <qstandardpaths.h> #include <qurl.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-5.44.0/src/xslt.cpp new/kdoctools-5.45.0/src/xslt.cpp --- old/kdoctools-5.44.0/src/xslt.cpp 2018-03-03 11:03:12.000000000 +0100 +++ new/kdoctools-5.45.0/src/xslt.cpp 2018-04-07 21:35:07.000000000 +0200 @@ -4,7 +4,7 @@ #ifdef Q_OS_WIN //one of the xslt/xml headers pulls in windows.h and breaks <limits> #define NOMINMAX -#include <QtCore/QHash> +#include <QHash> #endif #include "../config-kdoctools.h" @@ -19,14 +19,14 @@ #include <libxml/parserInternals.h> #include <libxml/catalog.h> -#include <QtCore/QDate> -#include <QtCore/QDir> -#include <QtCore/QFile> -#include <QtCore/QRegExp> -#include <QtCore/QStandardPaths> -#include <QtCore/QTextCodec> -#include <QtCore/QUrl> -#include <QtCore/QDebug> +#include <QDate> +#include <QDir> +#include <QFile> +#include <QRegExp> +#include <QStandardPaths> +#include <QTextCodec> +#include <QUrl> +#include <QDebug> #include <QByteArray> #include <QString> #include <QVector>
