packages: kdelibs/kdelibs-branch.diff - updated
glen
glen at pld-linux.org
Tue Jan 19 00:01:58 CET 2010
Author: glen Date: Mon Jan 18 23:01:58 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated
---- Files affected:
packages/kdelibs:
kdelibs-branch.diff (1.87 -> 1.88)
---- Diffs:
================================================================
Index: packages/kdelibs/kdelibs-branch.diff
diff -u packages/kdelibs/kdelibs-branch.diff:1.87 packages/kdelibs/kdelibs-branch.diff:1.88
--- packages/kdelibs/kdelibs-branch.diff:1.87 Tue Sep 8 00:16:07 2009
+++ packages/kdelibs/kdelibs-branch.diff Tue Jan 19 00:01:52 2010
@@ -1,7 +1,32 @@
+Index: kate/part/katehighlight.cpp
+===================================================================
+--- kate/part/katehighlight.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1076825)
++++ kate/part/katehighlight.cpp (.../branches/KDE/3.5/kdelibs) (revision 1076825)
+@@ -3225,7 +3225,7 @@
+ list.append(charAttribute);
+
+ KateAttribute* string = new KateAttribute();
+- string->setTextColor(QColor::QColor("#D00"));
++ string->setTextColor(QColor("#D00"));
+ string->setSelectedTextColor(Qt::red);
+ list.append(string);
+
+@@ -3242,9 +3242,9 @@
+
+ KateAttribute* alert = new KateAttribute();
+ alert->setTextColor(Qt::black);
+- alert->setSelectedTextColor( QColor::QColor("#FCC") );
++ alert->setSelectedTextColor( QColor("#FCC") );
+ alert->setBold(true);
+- alert->setBGColor( QColor::QColor("#FCC") );
++ alert->setBGColor( QColor("#FCC") );
+ list.append(alert);
+
+ KateAttribute* functionAttribute = new KateAttribute();
Index: kate/data/cmake.xml
===================================================================
---- kate/data/cmake.xml (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kate/data/cmake.xml (.../branches/KDE/3.5/kdelibs) (revision 1021033)
+--- kate/data/cmake.xml (.../tags/KDE/3.5.10/kdelibs) (revision 1076825)
++++ kate/data/cmake.xml (.../branches/KDE/3.5/kdelibs) (revision 1076825)
@@ -1,13 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE language SYSTEM "language.dtd">
@@ -300,260 +325,4876 @@
<item> WRAP_EXCLUDE </item>
<item> WRITE </item>
</list>
-Index: kioslave/ftp/ftp.cc
-===================================================================
---- kioslave/ftp/ftp.cc (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kioslave/ftp/ftp.cc (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -876,7 +876,7 @@
- // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
- // but anonftpd gives '227 =160,39,200,55,6,245'
- int i[6];
-- char *start = strchr(ftpResponse(3), '(');
-+ const char *start = strchr(ftpResponse(3), '(');
- if ( !start )
- start = strchr(ftpResponse(3), '=');
- if ( !start ||
-@@ -931,7 +931,7 @@
- return ERR_INTERNAL;
- }
-
-- char *start = strchr(ftpResponse(3), '|');
-+ const char *start = strchr(ftpResponse(3), '|');
- if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
- return ERR_INTERNAL;
-
-Index: kinit/start_kdeinit.c
-===================================================================
---- kinit/start_kdeinit.c (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kinit/start_kdeinit.c (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -44,7 +44,7 @@
- {
- char buf[ 1024 ];
- int procfile;
-- sprintf( buf, "/proc/%d/oom_adj", pid );
-+ sprintf( buf, "/proc/%d/stat", pid );
- if( !enable ) {
- /* Be paranoid and check that the pid we got from the pipe
- belongs to this user. */
-@@ -52,6 +52,7 @@
- if( lstat( buf, &st ) < 0 || st.st_uid != getuid())
- return 0;
- }
-+ sprintf( buf, "/proc/%d/oom_adj", pid );
- procfile = open( buf, O_WRONLY );
- if( procfile >= 0 ) {
- if( enable )
-Index: kio/kio/configure.in.in
+Index: kate/Mainpage.dox
===================================================================
---- kio/kio/configure.in.in (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kio/kio/configure.in.in (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -139,8 +139,30 @@
- AC_LANG_RESTORE
- ])
-
-- if test "$kde_cv_have_inotify" = "yes" ; then
-+ AC_CACHE_VAL(kde_cv_have_sys_inotify,
-+ [
-+ kde_cv_have_sys_inotify=no
-+ AC_LANG_SAVE
-+ AC_LANG_C
+--- kate/Mainpage.dox (.../tags/KDE/3.5.10/kdelibs) (revision 0)
++++ kate/Mainpage.dox (.../branches/KDE/3.5/kdelibs) (revision 1076825)
+@@ -0,0 +1,36 @@
++/** @mainpage Kate Editor Component
+
-+ AC_TRY_COMPILE(
-+ [
-+#include <sys/inotify.h>
-+ ],
-+ [
-+#ifndef IN_ALL_EVENTS
-+#error no inotify notification
-+#endif
-+ ],kde_cv_have_sys_inotify=yes,kde_cv_have_sys_inotify=no)
++The Kate Editor Component (also called Kate Part) implements the
++KTextEditor interfaces. Thus, all Kate Part classes are internal
++and never appear in public interfaces.
+
-+ AC_LANG_RESTORE
-+ ])
++If you wish to have a text editor component in your application,
++use the KTextEditor interfaces.
+
-+ if test "$kde_cv_have_inotify" = "yes" -o "$kde_cv_have_sys_inotify" = "yes"; then
- AC_DEFINE_UNQUOTED(HAVE_INOTIFY, 1, [Define if your system has Linux Inode Notification])
-+ if test "$kde_cv_have_sys_inotify" = "yes"; then
-+ AC_DEFINE_UNQUOTED(HAVE_SYS_INOTIFY, 1, [Define if your system has glibc support for inotify])
-+ fi
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
-Index: kio/kio/kdirwatch.cpp
-===================================================================
---- kio/kio/kdirwatch.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kio/kio/kdirwatch.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -64,11 +64,13 @@
- // debug
- #include <sys/ioctl.h>
-
--#ifdef HAVE_INOTIFY
-+#ifdef HAVE_SYS_INOTIFY
-+#include <sys/inotify.h>
-+#include <fcntl.h>
-+#elif HAVE_INOTIFY
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/syscall.h>
--#include <linux/types.h>
- // Linux kernel headers are documented to not compile
- #define _S390_BITOPS_H
- #include <linux/inotify.h>
-@@ -87,7 +89,9 @@
- {
- return syscall (__NR_inotify_rm_watch, fd, wd);
- }
-+#endif
-
-+#ifdef HAVE_INOTIFY
- #ifndef IN_ONLYDIR
- #define IN_ONLYDIR 0x01000000
- #endif
-@@ -99,7 +103,6 @@
- #ifndef IN_MOVE_SELF
- #define IN_MOVE_SELF 0x00000800
- #endif
--
- #endif
-
- #include <sys/utsname.h>
-Index: kdecore/kstringhandler.cpp
-===================================================================
---- kdecore/kstringhandler.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kdecore/kstringhandler.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -558,7 +558,7 @@
- QString result;
- const QChar *unicode = str.unicode();
- for ( uint i = 0; i < str.length(); ++i )
-- result += ( unicode[ i ].unicode() < 0x21 ) ? unicode[ i ] :
-+ result += ( unicode[ i ].unicode() <= 0x21 ) ? unicode[ i ] :
- QChar( 0x1001F - unicode[ i ].unicode() );
-
- return result;
-Index: kdecore/Mainpage.dox
++ at authors
++Christoph Cullmann \<cullmann at kde.org\><br>
++Joseph Wenninger \<jowenn at kde.org\><br>
++Anders Lund \<anders at alweb.dk\><br>
++Hamish Rodda \<rodda at kde.org\><br>
++Waldo Bastian \<bastian at kde.org\><br>
++Charles Samuels \<charles at kde.org\><br>
++Michael Bartl \<michael.bartl1 at chello.at\><br>
++Matt Newell \<newellm at proaxis.com\><br>
++Michael McCallum \<gholam at xtra.co.nz\><br>
++John Firebaugh \<jfirebaugh at kde.org\><br>
++Nadeem Hasan \<nhasan at nadmm.com\><br>
++Jochen Wilhelmy \<digisnap at cs.tu-berlin.de\><br>
++Glen Parker \<glenebob at nwlink.com\><br>
++Michael Koch \<koch at kde.org\><br>
++Dominik Haumann \<dhdev at gmx.de\>
++
++ at maintainers
++Christoph Cullmann \<cullmann at kde.org\>
++
++ at licenses
++ at lgpl
++
++*/
++// DOXYGEN_REFERENCES = kdecore kio kdeui kparts interfaces/kdocument interfaces/ktexteditor kjs
++// DOXYGEN_SET_PROJECT_NAME = Kate
++// vim:ts=4:sw=4:expandtab:filetype=doxygen
+Index: kconf_update/Mainpage.dox
===================================================================
---- kdecore/Mainpage.dox (.../tags/KDE/3.5.10/kdelibs) (revision 0)
-+++ kdecore/Mainpage.dox (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -0,0 +1,44 @@
-+/** \mainpage The KDE Core Library
+--- kconf_update/Mainpage.dox (.../tags/KDE/3.5.10/kdelibs) (revision 0)
++++ kconf_update/Mainpage.dox (.../branches/KDE/3.5/kdelibs) (revision 1076825)
+@@ -0,0 +1,31 @@
++/** @mainpage ./kconf_update
+
-+All KDE programs use this library to provide basic functionality such
-+as the configuration system, IPC, internationalization and locale
-+support, site-independent access to the filesystem and a large number
-+of other (but no less important) things.
-+<p>
-+All KDE applications should link to the kdecore library. Also, using a
-+KApplication derived class instead of QApplication is almost
-+mandatory if you expect your application to behave nicely within the
-+KDE environment.
++kconf_update is a tool designed to update config files. Over time applications
++sometimes need to rearrange the way configuration options are stored. Since
++such an update shouldn't influence the configuration options that the user
++has selected, the application must take care that the options stored in the
++old way will still be honored.
+
-+If you are unsure where to start, have a look at the
-+<a href="http://techbase.kde.org/Development/Tutorials">tutorials on
-+TechBase</a> to get you going.
++What used to happen is that the application looks up both the old and the
++new configuration option and then decides which one to use. This method has
++several drawbacks:
++- The application may need to read more configuration files than strictly
++ needed, resulting in a slower startup.
++- The application becomes bigger with code that will only be used once.
+
-+If you know what you are looking for, you should be able to find it in
-+the <a href="annotated.html">class list</a> or the
-+<a href="modules.html">modules list</a>.
++kconf_update addresses these problems by offering a framework to update
++configuration files without adding code to the application itself.
++
++See the <a href="http://websvn.kde.org/trunk/KDE/kdelibs/kconf_update/README.kconf_update?view=markup">README file</a> for more information.
+
+ at authors
-+Various: see copyrights on individual files for more information
++Waldo Bastian \<bastian at kde.org\>
+
+ at maintainers
-+See the
-+<a href="http://websvn.kde.org/trunk/KDE/kdelibs/kdecore/MAINTAINERS?view=markup">MAINTAINERS</a>
-+file.
++[Unknown/None]
+
+ at licenses
-+Library: @lgpl<br>
-+Some helper utilities: @gpl
++ at lgpl
+
+*/
++// vim:ts=4:sw=4:expandtab:filetype=doxygen
+Index: doc/common/tabs.css
+===================================================================
+--- doc/common/tabs.css (.../tags/KDE/3.5.10/kdelibs) (revision 0)
++++ doc/common/tabs.css (.../branches/KDE/3.5/kdelibs) (revision 1076825)
+@@ -0,0 +1,102 @@
++/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
+
-+/**
++DIV.tabs
++{
++ float : left;
++ width : 100%;
++ background : url("tab_b.gif") repeat-x bottom;
++ margin-bottom : 4px;
++}
+
-+\defgroup KDEMacros KDE Macros
++DIV.tabs UL
++{
++ margin : 0px;
++ padding-left : 10px;
++ list-style : none;
++}
+
-+*/
++DIV.tabs LI, DIV.tabs FORM
++{
++ display : inline;
++ margin : 0px;
++ padding : 0px;
++}
+
-+// DOXYGEN_EXCLUDE = malloc kde_file.h
-+// DOXYGEN_SET_INPUT += @topdir@/kdemacros.h.cmake
-+// DOXYGEN_SET_PROJECT_NAME = KDECore
-+// vim:ts=4:sw=4:expandtab:filetype=doxygen
-Index: khtml/html/htmltokenizer.cpp
-===================================================================
---- khtml/html/htmltokenizer.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ khtml/html/htmltokenizer.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -736,7 +736,7 @@
- #ifdef TOKEN_DEBUG
- kdDebug( 6036 ) << "unknown entity!" << endl;
- #endif
-- checkBuffer(10);
-+ checkBuffer(11);
- // ignore the sequence, add it to the buffer as plaintext
- *dest++ = '&';
- for(unsigned int i = 0; i < cBufferPos; i++)
-Index: khtml/rendering/table_layout.cpp
++DIV.tabs FORM
++{
++ float : right;
++}
++
++DIV.tabs A
++{
++ float : left;
++ background : url("tab_r.gif") no-repeat right top;
++ border-bottom : 1px solid #84B0C7;
++ font-size : x-small;
++ font-weight : bold;
++ text-decoration : none;
++}
++
++DIV.tabs A:hover
++{
++ background-position: 100% -150px;
++}
++
++DIV.tabs A:link, DIV.tabs A:visited,
++DIV.tabs A:active, DIV.tabs A:hover
++{
++ color: #1A419D;
++}
++
++DIV.tabs SPAN
++{
++ float : left;
++ display : block;
++ background : url("tab_l.gif") no-repeat left top;
++ padding : 5px 9px;
++ white-space : nowrap;
++}
++
++DIV.tabs INPUT
++{
++ float : right;
++ display : inline;
++ font-size : 1em;
++}
++
++DIV.tabs TD
++{
++ font-size : x-small;
++ font-weight : bold;
++ text-decoration : none;
++}
++
++
++
++/* Commented Backslash Hack hides rule from IE5-Mac \*/
++DIV.tabs SPAN {float : none;}
++/* End IE5-Mac hack */
++
++DIV.tabs A:hover SPAN
++{
++ background-position: 0% -150px;
++}
++
++DIV.tabs LI#current A
++{
++ background-position: 100% -150px;
++ border-width : 0px;
++}
++
++DIV.tabs LI#current SPAN
++{
++ background-position: 0% -150px;
++ padding-bottom : 6px;
++}
++
++DIV.nav
++{
++ background : none;
++ border : none;
++ border-bottom : 1px solid #84B0C7;
++}
+Index: doc/common/fdl-license
===================================================================
---- khtml/rendering/table_layout.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ khtml/rendering/table_layout.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -297,7 +297,8 @@
- #endif
- for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
- if ( width[i].isPercent() ) {
-- int w = base * width[i].value() / totalPercent;
-+ // totalPercent may be 0 below if all %-width specifed are 0%. (#172557)
-+ int w = totalPercent ? base * width[i].value() / totalPercent : 0;
- available -= w;
- calcWidth[i] = w;
- }
-@@ -313,7 +314,8 @@
+--- doc/common/fdl-license (.../tags/KDE/3.5.10/kdelibs) (revision 1076825)
++++ doc/common/fdl-license (.../branches/KDE/3.5/kdelibs) (revision 1076825)
+@@ -1,8 +1,9 @@
+ GNU Free Documentation License
+- Version 1.1, March 2000
++ Version 1.2, November 2002
- for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
- if ( width[i].isVariable() ) {
-- int w = available / totalVariable;
-+ // totalVariable may be 0 below if all the variable widths specified are 0.
-+ int w = totalVariable ? available / totalVariable : 0;
- available -= w;
- calcWidth[i] = w;
- totalVariable--;
-Index: kdoctools/customization/pt-BR/user.entities
-===================================================================
---- kdoctools/customization/pt-BR/user.entities (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kdoctools/customization/pt-BR/user.entities (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -17,7 +17,7 @@
- <!ENTITY Esc "<keycap>Esc</keycap>">
- <!ENTITY etc "<abbrev>etc</abbrev>">
- <!ENTITY ex "<abbrev>por exemplo</abbrev>">
--<!ENTITY FAQ "Perguntas Mais Freqüentes (do inglês <acronym>FAQ</acronym>)">
-+<!ENTITY FAQ "Perguntas mais freqüentes (do inglês <acronym>FAQ</acronym>)">
- <!ENTITY HTML '<acronym>HTML</acronym>'>
- <!ENTITY ie "isto é">
- <!ENTITY infocenter "<application>Centro de Informações</application>">
-@@ -34,7 +34,7 @@
- <!ENTITY LMB "botão <mousebutton>esquerdo</mousebutton> do mouse">
- <!ENTITY MMB "botão do <mousebutton>meio</mousebutton> do mouse">
- <!ENTITY OS "<acronym>Sistema Operacional</acronym>">
--<!ENTITY RMB "botão <mousebutton>direto</mousebutton> do mouse">
-+<!ENTITY RMB "botão <mousebutton>direito</mousebutton> do mouse">
- <!ENTITY Shift "<keycap>Shift</keycap>">
- <!ENTITY systemtray "<application>bandeja do sistema</application>">
- <!ENTITY Tab "<keycap>Tab</keycap>">
-Index: kdeui/kdatetbl.cpp
-===================================================================
---- kdeui/kdatetbl.cpp (.../tags/KDE/3.5.10/kdelibs) (revision 1021033)
-+++ kdeui/kdatetbl.cpp (.../branches/KDE/3.5/kdelibs) (revision 1021033)
-@@ -47,6 +47,7 @@
- #include "kdatetbl.h"
- #include "kpopupmenu.h"
- #include <qdatetime.h>
-+#include <qguardedptr.h>
- #include <qstring.h>
- #include <qpen.h>
- #include <qpainter.h>
-@@ -310,7 +311,7 @@
- painter->setPen(colorGroup().highlight());
- painter->setBrush(colorGroup().highlight());
- }
+- Copyright (C) 2000 Free Software Foundation, Inc.
+- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++
++ Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -10,12 +11,12 @@
+ 0. PREAMBLE
+
+ The purpose of this License is to make a manual, textbook, or other
+-written document "free" in the sense of freedom: to assure everyone
+-the effective freedom to copy and redistribute it, with or without
+-modifying it, either commercially or noncommercially. Secondarily,
+-this License preserves for the author and publisher a way to get
+-credit for their work, while not being considered responsible for
+-modifications made by others.
++functional and useful document "free" in the sense of freedom: to
++assure everyone the effective freedom to copy and redistribute it,
++with or without modifying it, either commercially or noncommercially.
++Secondarily, this License preserves for the author and publisher a way
++to get credit for their work, while not being considered responsible
++for modifications made by others.
+
+ This License is a kind of "copyleft", which means that derivative
+ works of the document must themselves be free in the same sense. It
+@@ -33,11 +34,15 @@
+
+ 1. APPLICABILITY AND DEFINITIONS
+
+-This License applies to any manual or other work that contains a
+-notice placed by the copyright holder saying it can be distributed
+-under the terms of this License. The "Document", below, refers to any
+-such manual or work. Any member of the public is a licensee, and is
+-addressed as "you".
++This License applies to any manual or other work, in any medium, that
++contains a notice placed by the copyright holder saying it can be
++distributed under the terms of this License. Such a notice grants a
++world-wide, royalty-free license, unlimited in duration, to use that
++work under the conditions stated herein. The "Document", below,
++refers to any such manual or work. Any member of the public is a
++licensee, and is addressed as "you". You accept the license if you
++copy, modify or distribute the work in a way requiring permission
++under copyright law.
+
+ A "Modified Version" of the Document means any work containing the
+ Document or a portion of it, either copied verbatim, or with
+@@ -47,7 +52,7 @@
+ the Document that deals exclusively with the relationship of the
+ publishers or authors of the Document to the Document's overall subject
+ (or to related matters) and contains nothing that could fall directly
+-within that overall subject. (For example, if the Document is in part a
++within that overall subject. (Thus, if the Document is in part a
+ textbook of mathematics, a Secondary Section may not explain any
+ mathematics.) The relationship could be a matter of historical
+ connection with the subject or with related matters, or of legal,
+@@ -56,33 +61,40 @@
+
+ The "Invariant Sections" are certain Secondary Sections whose titles
+ are designated, as being those of Invariant Sections, in the notice
+-that says that the Document is released under this License.
++that says that the Document is released under this License. If a
++section does not fit the above definition of Secondary then it is not
++allowed to be designated as Invariant. The Document may contain zero
++Invariant Sections. If the Document does not identify any Invariant
++Sections then there are none.
+
+ The "Cover Texts" are certain short passages of text that are listed,
+ as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+-the Document is released under this License.
++the Document is released under this License. A Front-Cover Text may
++be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+ A "Transparent" copy of the Document means a machine-readable copy,
+ represented in a format whose specification is available to the
+-general public, whose contents can be viewed and edited directly and
++general public, that is suitable for revising the document
+ straightforwardly with generic text editors or (for images composed of
+ pixels) generic paint programs or (for drawings) some widely available
+ drawing editor, and that is suitable for input to text formatters or
+ for automatic translation to a variety of formats suitable for input
+ to text formatters. A copy made in an otherwise Transparent file
+-format whose markup has been designed to thwart or discourage
+-subsequent modification by readers is not Transparent. A copy that is
+-not "Transparent" is called "Opaque".
++format whose markup, or absence of markup, has been arranged to thwart
++or discourage subsequent modification by readers is not Transparent.
++An image format is not Transparent if used for any substantial amount
++of text. A copy that is not "Transparent" is called "Opaque".
+
+ Examples of suitable formats for Transparent copies include plain
+ ASCII without markup, Texinfo input format, LaTeX input format, SGML
+ or XML using a publicly available DTD, and standard-conforming simple
+-HTML designed for human modification. Opaque formats include
+-PostScript, PDF, proprietary formats that can be read and edited only
+-by proprietary word processors, SGML or XML for which the DTD and/or
++HTML, PostScript or PDF designed for human modification. Examples of
++transparent image formats include PNG, XCF and JPG. Opaque formats
++include proprietary formats that can be read and edited only by
++proprietary word processors, SGML or XML for which the DTD and/or
+ processing tools are not generally available, and the
+-machine-generated HTML produced by some word processors for output
+-purposes only.
++machine-generated HTML, PostScript or PDF produced by some word
++processors for output purposes only.
+
+ The "Title Page" means, for a printed book, the title page itself,
+ plus such following pages as are needed to hold, legibly, the material
+@@ -91,7 +103,22 @@
+ the text near the most prominent appearance of the work's title,
+ preceding the beginning of the body of the text.
+
++A section "Entitled XYZ" means a named subunit of the Document whose
++title either is precisely XYZ or contains XYZ in parentheses following
++text that translates XYZ in another language. (Here XYZ stands for a
++specific section name mentioned below, such as "Acknowledgements",
++"Dedications", "Endorsements", or "History".) To "Preserve the Title"
++of such a section when you modify the Document means that it remains a
++section "Entitled XYZ" according to this definition.
+
++The Document may include Warranty Disclaimers next to the notice which
++states that this License applies to the Document. These Warranty
++Disclaimers are considered to be included by reference in this
++License, but only as regards disclaiming warranties: any other
++implication that these Warranty Disclaimers may have is void and has
++no effect on the meaning of this License.
++
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdelibs/kdelibs-branch.diff?r1=1.87&r2=1.88&f=u
More information about the pld-cvs-commit
mailing list