[Pkg-kde-commits] rev 966 - in trunk/packages/kdepim/debian: . patches
Daniel Schepler
schepler@costa.debian.org
Mon, 04 Apr 2005 23:23:35 +0000
Author: schepler
Date: 2005-04-04 23:23:31 +0000 (Mon, 04 Apr 2005)
New Revision: 966
Modified:
trunk/packages/kdepim/debian/changelog
trunk/packages/kdepim/debian/control
trunk/packages/kdepim/debian/copyright
trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff
Log:
kdepim 3.3.2-3 packaging.
Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog 2005-04-04 20:47:44 UTC (rev 965)
+++ trunk/packages/kdepim/debian/changelog 2005-04-04 23:23:31 UTC (rev 966)
@@ -1,3 +1,20 @@
+kdepim (4:3.3.2-3) unstable; urgency=medium
+
+ * KDE_3_3_BRANCH update.
+ * Move kleopatra to main, now that gnupg2 is in the archive.
+ Closes: #281689, #300499.
+ * Update kmail/kleopatra dependencies accordingly.
+ * Set urgency to medium to hopefully get these changes into sarge.
+ * Add Recommends on procmail to kmail, which is needed for fetching
+ mbox mail.
+ * Tighten libtool build dependency. This closes half of #285882,
+ while the other half is really a kdelibs issue.
+ * Include the GFDL in debian/copyright, since the handbooks are
+ licensed under it.
+ * Update the list of licenses.
+
+ -- Daniel Schepler <schepler@debian.org> Sun, 3 Apr 2005 20:23:43 -0700
+
kdepim (4:3.3.2-2) unstable; urgency=low
* Disable gnokii support again until bug #266566 is resolved.
Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control 2005-04-04 20:47:44 UTC (rev 965)
+++ trunk/packages/kdepim/debian/control 2005-04-04 23:23:31 UTC (rev 966)
@@ -3,15 +3,15 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>, Daniel Schepler <schepler@debian.org>
-Build-Depends: autoconf, automake1.9, bison, byacc, cdbs, debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.3.2-3), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libtool, libxpm-dev, sharutils, texinfo
-Build-Depends-Indep: doxygen, graphviz, qt3-doc, kdelibs4-doc
+Build-Depends: autoconf, automake1.9, bison, byacc, cdbs, debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.3.2-3), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libtool (>= 1.5), libxpm-dev, sharutils, texinfo
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
Build-Conflicts: libgnokii2-dev, libgnokii2
Standards-Version: 3.6.1.0
Package: kdepim
Section: kde
Architecture: all
-Depends: kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), libkcal2a (>= ${Source-Version}), libkdenetwork2 (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libmimelib1a (>= ${Source-Version})
+Depends: kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), libkcal2a (>= ${Source-Version}), libkdenetwork2 (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libmimelib1a (>= ${Source-Version})
Suggests: kdepim-doc-html
Description: KDE Personal Information Management metapackage
kdepim is a collection of Personal Information Management (PIM) tools for the
@@ -142,9 +142,9 @@
This package is part of the official KDE pim module.
Package: kleopatra
-Section: contrib/net
+Section: net
Architecture: any
-Depends: ${shlibs:Depends}, gpgsm, dirmngr, pinentry-qt | pinentry-x11
+Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11
Conflicts: kgpgcertmanager
Replaces: kgpgcertmanager
Provides: kgpgcertmanager
@@ -152,19 +152,14 @@
Kleopatra is the KDE tool for managing X.509 certificates in the gpgsm
keybox and for retrieving certificates from LDAP servers.
.
- To install this package, you will need unofficial packages for GnuPG
- version 1.9, and you will also need to recompile gpgme with S/MIME
- support. See http://lists.debian.org/debian-kde/2004/09/msg00102.html
- for details.
- .
This package is part of the official KDE pim module.
Package: kmail
Section: mail
Architecture: any
Depends: ${shlibs:Depends}, ${perl:Depends}
-Recommends: kdebase-kio-plugins, kdepim-kio-plugins
-Suggests: gnupg, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter, clamav | f-prot-installer
+Recommends: kdebase-kio-plugins, kdepim-kio-plugins, procmail
+Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter, clamav | f-prot-installer
Replaces: libkdenetwork2 (<< 4:3.2.92)
Provides: imap-client, mail-reader
Description: KDE Email client
Modified: trunk/packages/kdepim/debian/copyright
===================================================================
--- trunk/packages/kdepim/debian/copyright 2005-04-04 20:47:44 UTC (rev 965)
+++ trunk/packages/kdepim/debian/copyright 2005-04-04 23:23:31 UTC (rev 966)
@@ -18,15 +18,420 @@
/usr/share/common-licenses/BSD
/usr/share/common-licenses/GPL
+The kdocbook documentation for the applications is under the GFDL
+license. The complete text of this license is included below.
+
When in doubt, check the individual file, they should all have license
headings and other identifying marks.
-empath, kab2, kalarm, kalarmd, kandy, karm, kgantt, knotes, konsolekalendar,
-korganizer, kpilot, ksync, ldif, libdif, libimap, twister
+kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt, kfile-plugins,
+kgantt, kioslaves, kitchensync, kleopatra, kmail, kmailcvt, knode,
+knotes, konsolekalendar, kontact, korganizer, kpilot, ksync, ktnef,
+libkdenetwork, libkdepim, libkleopatra, libkpimidentities, libksieve,
+mimelib, wizards
----------------------------------------------------------------------------
GPL
-libical, libkcal, librmm
+libical, libkcal, libkpimexchange
------------------------
LGPL
+
+
+ GNU Free Documentation License
+ Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ 0. PREAMBLE
+
+ The purpose of this License is to make a manual, textbook, or other
+ 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
+ complements the GNU General Public License, which is a copyleft
+ license designed for free software.
+
+ We have designed this License in order to use it for manuals for free
+ software, because free software needs free documentation: a free
+ program should come with manuals providing the same freedoms that the
+ software does. But this License is not limited to software manuals;
+ it can be used for any textual work, regardless of subject matter or
+ whether it is published as a printed book. We recommend this License
+ principally for works whose purpose is instruction or reference.
+
+
+ 1. APPLICABILITY AND DEFINITIONS
+
+ 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
+ modifications and/or translated into another language.
+
+ A "Secondary Section" is a named appendix or a front-matter section of
+ 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. (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,
+ commercial, philosophical, ethical or political position regarding
+ them.
+
+ 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. 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. 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, 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, 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, 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, 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
+ this License requires to appear in the title page. For works in
+ formats which do not have any title page as such, "Title Page" means
+ 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.
+
+
+ 2. VERBATIM COPYING
+
+ You may copy and distribute the Document in any medium, either
+ commercially or noncommercially, provided that this License, the
+ copyright notices, and the license notice saying this License applies
+ to the Document are reproduced in all copies, and that you add no other
+ conditions whatsoever to those of this License. You may not use
+ technical measures to obstruct or control the reading or further
+ copying of the copies you make or distribute. However, you may accept
+ compensation in exchange for copies. If you distribute a large enough
+ number of copies you must also follow the conditions in section 3.
+
+ You may also lend copies, under the same conditions stated above, and
+ you may publicly display copies.
+
+
+ 3. COPYING IN QUANTITY
+
+ If you publish printed copies (or copies in media that commonly have
+ printed covers) of the Document, numbering more than 100, and the
+ Document's license notice requires Cover Texts, you must enclose the
+ copies in covers that carry, clearly and legibly, all these Cover
+ Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+ the back cover. Both covers must also clearly and legibly identify
+ you as the publisher of these copies. The front cover must present
+ the full title with all words of the title equally prominent and
+ visible. You may add other material on the covers in addition.
+ Copying with changes limited to the covers, as long as they preserve
+ the title of the Document and satisfy these conditions, can be treated
+ as verbatim copying in other respects.
+
+ If the required texts for either cover are too voluminous to fit
+ legibly, you should put the first ones listed (as many as fit
+ reasonably) on the actual cover, and continue the rest onto adjacent
+ pages.
+
+ If you publish or distribute Opaque copies of the Document numbering
+ more than 100, you must either include a machine-readable Transparent
+ copy along with each Opaque copy, or state in or with each Opaque copy
+ a computer-network location from which the general network-using
+ public has access to download using public-standard network protocols
+ a complete Transparent copy of the Document, free of added material.
+ If you use the latter option, you must take reasonably prudent steps,
+ when you begin distribution of Opaque copies in quantity, to ensure
+ that this Transparent copy will remain thus accessible at the stated
+ location until at least one year after the last time you distribute an
+ Opaque copy (directly or through your agents or retailers) of that
+ edition to the public.
+
+ It is requested, but not required, that you contact the authors of the
+ Document well before redistributing any large number of copies, to give
+ them a chance to provide you with an updated version of the Document.
+
+
+ 4. MODIFICATIONS
+
+ You may copy and distribute a Modified Version of the Document under
+ the conditions of sections 2 and 3 above, provided that you release
+ the Modified Version under precisely this License, with the Modified
+ Version filling the role of the Document, thus licensing distribution
+ and modification of the Modified Version to whoever possesses a copy
+ of it. In addition, you must do these things in the Modified Version:
+
+ A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+ B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+ C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+ D. Preserve all the copyright notices of the Document.
+ E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+ F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+ G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+ H. Include an unaltered copy of this License.
+ I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+ J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+ K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+ L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+ M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+ N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+ O. Preserve any Warranty Disclaimers.
+
+ If the Modified Version includes new front-matter sections or
+ appendices that qualify as Secondary Sections and contain no material
+ copied from the Document, you may at your option designate some or all
+ of these sections as invariant. To do this, add their titles to the
+ list of Invariant Sections in the Modified Version's license notice.
+ These titles must be distinct from any other section titles.
+
+ You may add a section Entitled "Endorsements", provided it contains
+ nothing but endorsements of your Modified Version by various
+ parties--for example, statements of peer review or that the text has
+ been approved by an organization as the authoritative definition of a
+ standard.
+
+ You may add a passage of up to five words as a Front-Cover Text, and a
+ passage of up to 25 words as a Back-Cover Text, to the end of the list
+ of Cover Texts in the Modified Version. Only one passage of
+ Front-Cover Text and one of Back-Cover Text may be added by (or
+ through arrangements made by) any one entity. If the Document already
+ includes a cover text for the same cover, previously added by you or
+ by arrangement made by the same entity you are acting on behalf of,
+ you may not add another; but you may replace the old one, on explicit
+ permission from the previous publisher that added the old one.
+
+ The author(s) and publisher(s) of the Document do not by this License
+ give permission to use their names for publicity for or to assert or
+ imply endorsement of any Modified Version.
+
+
+ 5. COMBINING DOCUMENTS
+
+ You may combine the Document with other documents released under this
+ License, under the terms defined in section 4 above for modified
+ versions, provided that you include in the combination all of the
+ Invariant Sections of all of the original documents, unmodified, and
+ list them all as Invariant Sections of your combined work in its
+ license notice, and that you preserve all their Warranty Disclaimers.
+
+ The combined work need only contain one copy of this License, and
+ multiple identical Invariant Sections may be replaced with a single
+ copy. If there are multiple Invariant Sections with the same name but
+ different contents, make the title of each such section unique by
+ adding at the end of it, in parentheses, the name of the original
+ author or publisher of that section if known, or else a unique number.
+ Make the same adjustment to the section titles in the list of
+ Invariant Sections in the license notice of the combined work.
+
+ In the combination, you must combine any sections Entitled "History"
+ in the various original documents, forming one section Entitled
+ "History"; likewise combine any sections Entitled "Acknowledgements",
+ and any sections Entitled "Dedications". You must delete all sections
+ Entitled "Endorsements".
+
+
+ 6. COLLECTIONS OF DOCUMENTS
+
+ You may make a collection consisting of the Document and other documents
+ released under this License, and replace the individual copies of this
+ License in the various documents with a single copy that is included in
+ the collection, provided that you follow the rules of this License for
+ verbatim copying of each of the documents in all other respects.
+
+ You may extract a single document from such a collection, and distribute
+ it individually under this License, provided you insert a copy of this
+ License into the extracted document, and follow this License in all
+ other respects regarding verbatim copying of that document.
+
+
+ 7. AGGREGATION WITH INDEPENDENT WORKS
+
+ A compilation of the Document or its derivatives with other separate
+ and independent documents or works, in or on a volume of a storage or
+ distribution medium, is called an "aggregate" if the copyright
+ resulting from the compilation is not used to limit the legal rights
+ of the compilation's users beyond what the individual works permit.
+ When the Document is included in an aggregate, this License does not
+ apply to the other works in the aggregate which are not themselves
+ derivative works of the Document.
+
+ If the Cover Text requirement of section 3 is applicable to these
+ copies of the Document, then if the Document is less than one half of
+ the entire aggregate, the Document's Cover Texts may be placed on
+ covers that bracket the Document within the aggregate, or the
+ electronic equivalent of covers if the Document is in electronic form.
+ Otherwise they must appear on printed covers that bracket the whole
+ aggregate.
+
+
+ 8. TRANSLATION
+
+ Translation is considered a kind of modification, so you may
+ distribute translations of the Document under the terms of section 4.
+ Replacing Invariant Sections with translations requires special
+ permission from their copyright holders, but you may include
+ translations of some or all Invariant Sections in addition to the
+ original versions of these Invariant Sections. You may include a
+ translation of this License, and all the license notices in the
+ Document, and any Warranty Disclaimers, provided that you also include
+ the original English version of this License and the original versions
+ of those notices and disclaimers. In case of a disagreement between
+ the translation and the original version of this License or a notice
+ or disclaimer, the original version will prevail.
+
+ If a section in the Document is Entitled "Acknowledgements",
+ "Dedications", or "History", the requirement (section 4) to Preserve
+ its Title (section 1) will typically require changing the actual
+ title.
+
+
+ 9. TERMINATION
+
+ You may not copy, modify, sublicense, or distribute the Document except
+ as expressly provided for under this License. Any other attempt to
+ copy, modify, sublicense or distribute the Document is void, and will
+ automatically terminate your rights under this License. However,
+ parties who have received copies, or rights, from you under this
+ License will not have their licenses terminated so long as such
+ parties remain in full compliance.
+
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+ The Free Software Foundation may publish new, revised versions
+ of the GNU Free Documentation License from time to time. Such new
+ versions will be similar in spirit to the present version, but may
+ differ in detail to address new problems or concerns. See
+ http://www.gnu.org/copyleft/.
+
+ Each version of the License is given a distinguishing version number.
+ If the Document specifies that a particular numbered version of this
+ License "or any later version" applies to it, you have the option of
+ following the terms and conditions either of that specified version or
+ of any later version that has been published (not as a draft) by the
+ Free Software Foundation. If the Document does not specify a version
+ number of this License, you may choose any version ever published (not
+ as a draft) by the Free Software Foundation.
+
+
+ ADDENDUM: How to use this License for your documents
+
+ To use this License in a document you have written, include a copy of
+ the License in the document and put the following copyright and
+ license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ 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 no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+ Texts. A copy of the license is included in the section entitled
+ "GNU Free Documentation License".
+
+ If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+ replace the "with...Texts." line with this:
+
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+ If you have Invariant Sections without Cover Texts, or some other
+ combination of the three, merge those two alternatives to suit the
+ situation.
+
+ 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.
Modified: trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff 2005-04-04 20:47:44 UTC (rev 965)
+++ trunk/packages/kdepim/debian/patches/01_kdepim_branch.diff 2005-04-04 23:23:31 UTC (rev 966)
@@ -3,7 +3,7 @@
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.461.2.2
retrieving revision 2.461.2.3
-diff -u -r2.461.2.2 -r2.461.2.3
+diff -u -d -r2.461.2.2 -r2.461.2.3
--- admin/acinclude.m4.in 12 Nov 2004 22:48:09 -0000 2.461.2.2
+++ admin/acinclude.m4.in 9 Dec 2004 21:22:14 -0000 2.461.2.3
@@ -4254,7 +4254,8 @@
@@ -29,7 +29,7 @@
RCS file: /home/kde/kdepim/certmanager/certmanager.cpp,v
retrieving revision 1.106.2.2
retrieving revision 1.106.2.3
-diff -u -r1.106.2.2 -r1.106.2.3
+diff -u -d -r1.106.2.2 -r1.106.2.3
--- certmanager/certmanager.cpp 19 Oct 2004 20:41:55 -0000 1.106.2.2
+++ certmanager/certmanager.cpp 27 Jan 2005 15:57:48 -0000 1.106.2.3
@@ -58,6 +58,7 @@
@@ -65,7 +65,7 @@
RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_appear.desktop,v
retrieving revision 1.36.2.11
retrieving revision 1.36.2.14
-diff -u -r1.36.2.11 -r1.36.2.14
+diff -u -d -r1.36.2.11 -r1.36.2.14
--- certmanager/conf/kleopatra_config_appear.desktop 26 Nov 2004 08:05:18 -0000 1.36.2.11
+++ certmanager/conf/kleopatra_config_appear.desktop 26 Jan 2005 08:10:27 -0000 1.36.2.14
@@ -14,6 +14,7 @@
@@ -128,7 +128,7 @@
RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_dirserv.desktop,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
-diff -u -r1.30.2.8 -r1.30.2.9
+diff -u -d -r1.30.2.8 -r1.30.2.9
--- certmanager/conf/kleopatra_config_dirserv.desktop 13 Nov 2004 07:20:47 -0000 1.30.2.8
+++ certmanager/conf/kleopatra_config_dirserv.desktop 29 Dec 2004 21:44:48 -0000 1.30.2.9
@@ -14,6 +14,7 @@
@@ -160,7 +160,7 @@
RCS file: /home/kde/kdepim/certmanager/conf/kleopatra_config_dnorder.desktop,v
retrieving revision 1.28.2.8
retrieving revision 1.28.2.9
-diff -u -r1.28.2.8 -r1.28.2.9
+diff -u -d -r1.28.2.8 -r1.28.2.9
--- certmanager/conf/kleopatra_config_dnorder.desktop 13 Nov 2004 07:20:47 -0000 1.28.2.8
+++ certmanager/conf/kleopatra_config_dnorder.desktop 29 Dec 2004 21:44:48 -0000 1.28.2.9
@@ -14,6 +14,7 @@
@@ -192,7 +192,7 @@
RCS file: /home/kde/kdepim/certmanager/lib/libkleopatrarc.desktop,v
retrieving revision 1.45.2.8
retrieving revision 1.45.2.12
-diff -u -r1.45.2.8 -r1.45.2.12
+diff -u -d -r1.45.2.8 -r1.45.2.12
--- certmanager/lib/libkleopatrarc.desktop 13 Nov 2004 07:20:47 -0000 1.45.2.8
+++ certmanager/lib/libkleopatrarc.desktop 23 Feb 2005 09:00:23 -0000 1.45.2.12
@@ -1,6 +1,7 @@
@@ -261,7 +261,7 @@
RCS file: /home/kde/kdepim/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp,v
retrieving revision 1.25
retrieving revision 1.25.2.1
-diff -u -r1.25 -r1.25.2.1
+diff -u -d -r1.25 -r1.25.2.1
--- certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp 22 Jun 2004 09:25:42 -0000 1.25
+++ certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp 11 Jan 2005 23:18:55 -0000 1.25.2.1
@@ -183,8 +183,8 @@
@@ -280,7 +280,7 @@
RCS file: /home/kde/kdepim/certmanager/lib/ui/backendconfigwidget.cpp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
-diff -u -r1.6 -r1.6.2.1
+diff -u -d -r1.6 -r1.6.2.1
--- certmanager/lib/ui/backendconfigwidget.cpp 9 Jun 2004 14:56:35 -0000 1.6
+++ certmanager/lib/ui/backendconfigwidget.cpp 27 Jan 2005 15:57:49 -0000 1.6.2.1
@@ -45,6 +45,8 @@
@@ -311,7 +311,7 @@
RCS file: /home/kde/kdepim/kaddressbook/kaddressbook.desktop,v
retrieving revision 1.139.2.4
retrieving revision 1.139.2.6
-diff -u -r1.139.2.4 -r1.139.2.6
+diff -u -d -r1.139.2.4 -r1.139.2.6
--- kaddressbook/kaddressbook.desktop 28 Nov 2004 08:33:53 -0000 1.139.2.4
+++ kaddressbook/kaddressbook.desktop 23 Feb 2005 09:00:23 -0000 1.139.2.6
@@ -17,6 +17,7 @@
@@ -335,7 +335,7 @@
RCS file: /home/kde/kdepim/kaddressbook/kaddressbook_view.desktop,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
-diff -u -r1.41.2.3 -r1.41.2.4
+diff -u -d -r1.41.2.3 -r1.41.2.4
--- kaddressbook/kaddressbook_view.desktop 28 Nov 2004 08:33:53 -0000 1.41.2.3
+++ kaddressbook/kaddressbook_view.desktop 29 Dec 2004 21:44:49 -0000 1.41.2.4
@@ -3,8 +3,10 @@
@@ -354,7 +354,7 @@
RCS file: /home/kde/kdepim/kaddressbook/csv-templates/kaddressbook.desktop,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
-diff -u -r1.37.2.3 -r1.37.2.4
+diff -u -d -r1.37.2.3 -r1.37.2.4
--- kaddressbook/csv-templates/kaddressbook.desktop 24 Oct 2004 07:05:54 -0000 1.37.2.3
+++ kaddressbook/csv-templates/kaddressbook.desktop 12 Dec 2004 08:32:43 -0000 1.37.2.4
@@ -22,6 +22,7 @@
@@ -370,7 +370,7 @@
RCS file: /home/kde/kdepim/kaddressbook/csv-templates/yahoo.desktop,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.5
-diff -u -r1.41.2.4 -r1.41.2.5
+diff -u -d -r1.41.2.4 -r1.41.2.5
--- kaddressbook/csv-templates/yahoo.desktop 13 Nov 2004 07:20:47 -0000 1.41.2.4
+++ kaddressbook/csv-templates/yahoo.desktop 29 Dec 2004 21:44:49 -0000 1.41.2.5
@@ -9,6 +9,7 @@
@@ -386,7 +386,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/cryptosettings.desktop,v
retrieving revision 1.32.2.8
retrieving revision 1.32.2.9
-diff -u -r1.32.2.8 -r1.32.2.9
+diff -u -d -r1.32.2.8 -r1.32.2.9
--- kaddressbook/editors/cryptosettings.desktop 13 Nov 2004 07:20:48 -0000 1.32.2.8
+++ kaddressbook/editors/cryptosettings.desktop 29 Dec 2004 21:44:50 -0000 1.32.2.9
@@ -2,6 +2,7 @@
@@ -402,7 +402,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/imaddresseditor.desktop,v
retrieving revision 1.23.2.8
retrieving revision 1.23.2.10
-diff -u -r1.23.2.8 -r1.23.2.10
+diff -u -d -r1.23.2.8 -r1.23.2.10
--- kaddressbook/editors/imaddresseditor.desktop 13 Nov 2004 07:20:48 -0000 1.23.2.8
+++ kaddressbook/editors/imaddresseditor.desktop 29 Dec 2004 21:44:50 -0000 1.23.2.10
@@ -1,9 +1,11 @@
@@ -434,7 +434,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/kaddressbookimprotocol.desktop,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
-diff -u -r1.20.2.8 -r1.20.2.9
+diff -u -d -r1.20.2.8 -r1.20.2.9
--- kaddressbook/editors/kaddressbookimprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.20.2.8
+++ kaddressbook/editors/kaddressbookimprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.20.2.9
@@ -2,6 +2,7 @@
@@ -450,7 +450,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/aimprotocol.desktop,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.10
-diff -u -r1.20.2.8 -r1.20.2.10
+diff -u -d -r1.20.2.8 -r1.20.2.10
--- kaddressbook/editors/protocols/aimprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.20.2.8
+++ kaddressbook/editors/protocols/aimprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.20.2.10
@@ -5,8 +5,10 @@
@@ -469,7 +469,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/gaduprotocol.desktop,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
-diff -u -r1.18.2.8 -r1.18.2.9
+diff -u -d -r1.18.2.8 -r1.18.2.9
--- kaddressbook/editors/protocols/gaduprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.18.2.8
+++ kaddressbook/editors/protocols/gaduprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.18.2.9
@@ -5,6 +5,7 @@
@@ -485,7 +485,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/icqprotocol.desktop,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
-diff -u -r1.19.2.8 -r1.19.2.9
+diff -u -d -r1.19.2.8 -r1.19.2.9
--- kaddressbook/editors/protocols/icqprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.19.2.8
+++ kaddressbook/editors/protocols/icqprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.19.2.9
@@ -5,8 +5,10 @@
@@ -504,7 +504,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/ircprotocol.desktop,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
-diff -u -r1.12.2.4 -r1.12.2.5
+diff -u -d -r1.12.2.4 -r1.12.2.5
--- kaddressbook/editors/protocols/ircprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.12.2.4
+++ kaddressbook/editors/protocols/ircprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.12.2.5
@@ -5,6 +5,7 @@
@@ -520,7 +520,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/jabberprotocol.desktop,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.10
-diff -u -r1.19.2.8 -r1.19.2.10
+diff -u -d -r1.19.2.8 -r1.19.2.10
--- kaddressbook/editors/protocols/jabberprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.19.2.8
+++ kaddressbook/editors/protocols/jabberprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.19.2.10
@@ -5,8 +5,10 @@
@@ -539,7 +539,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/msnprotocol.desktop,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.6
-diff -u -r1.6.2.4 -r1.6.2.6
+diff -u -d -r1.6.2.4 -r1.6.2.6
--- kaddressbook/editors/protocols/msnprotocol.desktop 10 Nov 2004 07:37:26 -0000 1.6.2.4
+++ kaddressbook/editors/protocols/msnprotocol.desktop 23 Feb 2005 09:00:24 -0000 1.6.2.6
@@ -5,7 +5,9 @@
@@ -557,7 +557,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/smsprotocol.desktop,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
-diff -u -r1.19.2.8 -r1.19.2.9
+diff -u -d -r1.19.2.8 -r1.19.2.9
--- kaddressbook/editors/protocols/smsprotocol.desktop 13 Nov 2004 07:20:48 -0000 1.19.2.8
+++ kaddressbook/editors/protocols/smsprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.19.2.9
@@ -5,8 +5,10 @@
@@ -576,7 +576,7 @@
RCS file: /home/kde/kdepim/kaddressbook/editors/protocols/yahooprotocol.desktop,v
retrieving revision 1.19.2.9
retrieving revision 1.19.2.10
-diff -u -r1.19.2.9 -r1.19.2.10
+diff -u -d -r1.19.2.9 -r1.19.2.10
--- kaddressbook/editors/protocols/yahooprotocol.desktop 22 Nov 2004 08:35:07 -0000 1.19.2.9
+++ kaddressbook/editors/protocols/yahooprotocol.desktop 29 Dec 2004 21:44:50 -0000 1.19.2.10
@@ -5,6 +5,7 @@
@@ -592,7 +592,7 @@
RCS file: /home/kde/kdepim/kaddressbook/features/resourceselection.desktop,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.10
-diff -u -r1.15.2.8 -r1.15.2.10
+diff -u -d -r1.15.2.8 -r1.15.2.10
--- kaddressbook/features/resourceselection.desktop 28 Nov 2004 08:33:54 -0000 1.15.2.8
+++ kaddressbook/features/resourceselection.desktop 5 Jan 2005 07:50:29 -0000 1.15.2.10
@@ -2,7 +2,9 @@
@@ -618,7 +618,7 @@
RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop,v
retrieving revision 1.23.2.9
retrieving revision 1.23.2.10
-diff -u -r1.23.2.9 -r1.23.2.10
+diff -u -d -r1.23.2.9 -r1.23.2.10
--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop 13 Nov 2004 07:20:49 -0000 1.23.2.9
+++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop 29 Dec 2004 21:44:51 -0000 1.23.2.10
@@ -3,6 +3,7 @@
@@ -634,7 +634,7 @@
RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_extension.desktop,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
-diff -u -r1.28.2.3 -r1.28.2.4
+diff -u -d -r1.28.2.3 -r1.28.2.4
--- kaddressbook/interfaces/kaddressbook_extension.desktop 28 Nov 2004 08:33:54 -0000 1.28.2.3
+++ kaddressbook/interfaces/kaddressbook_extension.desktop 29 Dec 2004 21:44:51 -0000 1.28.2.4
@@ -3,6 +3,7 @@
@@ -650,7 +650,7 @@
RCS file: /home/kde/kdepim/kaddressbook/interfaces/kaddressbook_xxport.desktop,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.6
-diff -u -r1.30.2.4 -r1.30.2.6
+diff -u -d -r1.30.2.4 -r1.30.2.6
--- kaddressbook/interfaces/kaddressbook_xxport.desktop 28 Nov 2004 08:33:54 -0000 1.30.2.4
+++ kaddressbook/interfaces/kaddressbook_xxport.desktop 26 Jan 2005 08:10:27 -0000 1.30.2.6
@@ -3,8 +3,10 @@
@@ -669,7 +669,7 @@
RCS file: /home/kde/kdepim/kaddressbook/interfaces/xxport.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
-diff -u -r1.2 -r1.2.2.1
+diff -u -d -r1.2 -r1.2.2.1
--- kaddressbook/interfaces/xxport.h 20 Jun 2004 10:10:55 -0000 1.2
+++ kaddressbook/interfaces/xxport.h 4 Feb 2005 23:40:03 -0000 1.2.2.1
@@ -33,6 +33,32 @@
@@ -710,7 +710,7 @@
RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabconfig.desktop,v
retrieving revision 1.81.2.5
retrieving revision 1.81.2.10
-diff -u -r1.81.2.5 -r1.81.2.10
+diff -u -d -r1.81.2.5 -r1.81.2.10
--- kaddressbook/kcmconfigs/kabconfig.desktop 28 Nov 2004 08:33:54 -0000 1.81.2.5
+++ kaddressbook/kcmconfigs/kabconfig.desktop 23 Feb 2005 09:00:24 -0000 1.81.2.10
@@ -29,6 +29,7 @@
@@ -745,7 +745,7 @@
RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabcustomfields.desktop,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.14
-diff -u -r1.26.2.10 -r1.26.2.14
+diff -u -d -r1.26.2.10 -r1.26.2.14
--- kaddressbook/kcmconfigs/kabcustomfields.desktop 28 Nov 2004 08:33:54 -0000 1.26.2.10
+++ kaddressbook/kcmconfigs/kabcustomfields.desktop 26 Jan 2005 08:10:28 -0000 1.26.2.14
@@ -13,7 +13,9 @@
@@ -789,7 +789,7 @@
RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/kabldapconfig.desktop,v
retrieving revision 1.72.2.5
retrieving revision 1.72.2.6
-diff -u -r1.72.2.5 -r1.72.2.6
+diff -u -d -r1.72.2.5 -r1.72.2.6
--- kaddressbook/kcmconfigs/kabldapconfig.desktop 28 Nov 2004 08:33:54 -0000 1.72.2.5
+++ kaddressbook/kcmconfigs/kabldapconfig.desktop 29 Dec 2004 21:44:51 -0000 1.72.2.6
@@ -52,6 +52,7 @@
@@ -805,7 +805,7 @@
RCS file: /home/kde/kdepim/kaddressbook/kcmconfigs/ldapoptionswidget.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
-diff -u -r1.9 -r1.9.2.1
+diff -u -d -r1.9 -r1.9.2.1
--- kaddressbook/kcmconfigs/ldapoptionswidget.cpp 20 May 2004 14:30:28 -0000 1.9
+++ kaddressbook/kcmconfigs/ldapoptionswidget.cpp 10 Dec 2004 20:08:05 -0000 1.9.2.1
@@ -201,8 +201,10 @@
@@ -824,7 +824,7 @@
RCS file: /home/kde/kdepim/kaddressbook/views/cardview.desktop,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
-diff -u -r1.42.2.2 -r1.42.2.3
+diff -u -d -r1.42.2.2 -r1.42.2.3
--- kaddressbook/views/cardview.desktop 28 Nov 2004 08:33:55 -0000 1.42.2.2
+++ kaddressbook/views/cardview.desktop 29 Dec 2004 21:44:51 -0000 1.42.2.3
@@ -2,8 +2,10 @@
@@ -843,7 +843,7 @@
RCS file: /home/kde/kdepim/kaddressbook/views/iconview.desktop,v
retrieving revision 1.38.2.5
retrieving revision 1.38.2.7
-diff -u -r1.38.2.5 -r1.38.2.7
+diff -u -d -r1.38.2.5 -r1.38.2.7
--- kaddressbook/views/iconview.desktop 28 Nov 2004 08:33:55 -0000 1.38.2.5
+++ kaddressbook/views/iconview.desktop 23 Feb 2005 09:00:24 -0000 1.38.2.7
@@ -19,7 +19,7 @@
@@ -868,7 +868,7 @@
RCS file: /home/kde/kdepim/kaddressbook/views/tableview.desktop,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
-diff -u -r1.42.2.2 -r1.42.2.3
+diff -u -d -r1.42.2.2 -r1.42.2.3
--- kaddressbook/views/tableview.desktop 28 Nov 2004 08:33:55 -0000 1.42.2.2
+++ kaddressbook/views/tableview.desktop 29 Dec 2004 21:44:51 -0000 1.42.2.3
@@ -2,6 +2,7 @@
@@ -884,7 +884,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/bookmark_xxport.desktop,v
retrieving revision 1.47.2.6
retrieving revision 1.47.2.7
-diff -u -r1.47.2.6 -r1.47.2.7
+diff -u -d -r1.47.2.6 -r1.47.2.7
--- kaddressbook/xxport/bookmark_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.47.2.6
+++ kaddressbook/xxport/bookmark_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.47.2.7
@@ -2,6 +2,7 @@
@@ -908,7 +908,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/csv_xxport.desktop,v
retrieving revision 1.50.2.5
retrieving revision 1.50.2.6
-diff -u -r1.50.2.5 -r1.50.2.6
+diff -u -d -r1.50.2.5 -r1.50.2.6
--- kaddressbook/xxport/csv_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.50.2.5
+++ kaddressbook/xxport/csv_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.50.2.6
@@ -2,6 +2,7 @@
@@ -932,7 +932,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/eudora_xxport.desktop,v
retrieving revision 1.47.2.5
retrieving revision 1.47.2.6
-diff -u -r1.47.2.5 -r1.47.2.6
+diff -u -d -r1.47.2.5 -r1.47.2.6
--- kaddressbook/xxport/eudora_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.47.2.5
+++ kaddressbook/xxport/eudora_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.47.2.6
@@ -2,6 +2,7 @@
@@ -956,7 +956,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/gnokii_xxport.desktop,v
retrieving revision 1.42.2.4
retrieving revision 1.42.2.5
-diff -u -r1.42.2.4 -r1.42.2.5
+diff -u -d -r1.42.2.4 -r1.42.2.5
--- kaddressbook/xxport/gnokii_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.42.2.4
+++ kaddressbook/xxport/gnokii_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.42.2.5
@@ -2,6 +2,7 @@
@@ -980,7 +980,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/kde2_xxport.desktop,v
retrieving revision 1.47.2.6
retrieving revision 1.47.2.7
-diff -u -r1.47.2.6 -r1.47.2.7
+diff -u -d -r1.47.2.6 -r1.47.2.7
--- kaddressbook/xxport/kde2_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.47.2.6
+++ kaddressbook/xxport/kde2_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.47.2.7
@@ -2,6 +2,7 @@
@@ -1004,7 +1004,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/ldif_xxport.desktop,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
-diff -u -r1.48.2.5 -r1.48.2.6
+diff -u -d -r1.48.2.5 -r1.48.2.6
--- kaddressbook/xxport/ldif_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.48.2.5
+++ kaddressbook/xxport/ldif_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.48.2.6
@@ -2,6 +2,7 @@
@@ -1028,7 +1028,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/opera_xxport.desktop,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.6
-diff -u -r1.43.2.5 -r1.43.2.6
+diff -u -d -r1.43.2.5 -r1.43.2.6
--- kaddressbook/xxport/opera_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.43.2.5
+++ kaddressbook/xxport/opera_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.43.2.6
@@ -2,7 +2,9 @@
@@ -1054,7 +1054,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/pab_xxport.desktop,v
retrieving revision 1.43.2.6
retrieving revision 1.43.2.7
-diff -u -r1.43.2.6 -r1.43.2.7
+diff -u -d -r1.43.2.6 -r1.43.2.7
--- kaddressbook/xxport/pab_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.43.2.6
+++ kaddressbook/xxport/pab_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.43.2.7
@@ -2,6 +2,7 @@
@@ -1078,7 +1078,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/vcard_xxport.cpp,v
retrieving revision 1.21
retrieving revision 1.21.2.1
-diff -u -r1.21 -r1.21.2.1
+diff -u -d -r1.21 -r1.21.2.1
--- kaddressbook/xxport/vcard_xxport.cpp 17 Jul 2004 14:47:07 -0000 1.21
+++ kaddressbook/xxport/vcard_xxport.cpp 8 Jan 2005 01:44:10 -0000 1.21.2.1
@@ -27,6 +27,7 @@
@@ -1109,7 +1109,7 @@
RCS file: /home/kde/kdepim/kaddressbook/xxport/vcard_xxport.desktop,v
retrieving revision 1.50.2.5
retrieving revision 1.50.2.6
-diff -u -r1.50.2.5 -r1.50.2.6
+diff -u -d -r1.50.2.5 -r1.50.2.6
--- kaddressbook/xxport/vcard_xxport.desktop 28 Nov 2004 08:33:55 -0000 1.50.2.5
+++ kaddressbook/xxport/vcard_xxport.desktop 29 Dec 2004 21:44:52 -0000 1.50.2.6
@@ -2,7 +2,9 @@
@@ -1135,7 +1135,7 @@
RCS file: /home/kde/kdepim/kalarm/Changelog,v
retrieving revision 1.73.2.12
retrieving revision 1.73.2.19
-diff -u -r1.73.2.12 -r1.73.2.19
+diff -u -d -r1.73.2.12 -r1.73.2.19
--- kalarm/Changelog 27 Nov 2004 12:30:33 -0000 1.73.2.12
+++ kalarm/Changelog 6 Feb 2005 22:51:11 -0000 1.73.2.19
@@ -1,6 +1,15 @@
@@ -1160,7 +1160,7 @@
RCS file: /home/kde/kdepim/kalarm/alarmtimewidget.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
-diff -u -r1.13 -r1.13.2.1
+diff -u -d -r1.13 -r1.13.2.1
--- kalarm/alarmtimewidget.cpp 3 Aug 2004 23:59:10 -0000 1.13
+++ kalarm/alarmtimewidget.cpp 5 Dec 2004 18:03:41 -0000 1.13.2.1
@@ -153,8 +153,8 @@
@@ -1197,7 +1197,7 @@
RCS file: /home/kde/kdepim/kalarm/birthdaydlg.cpp,v
retrieving revision 1.26
retrieving revision 1.26.2.2
-diff -u -r1.26 -r1.26.2.2
+diff -u -d -r1.26 -r1.26.2.2
--- kalarm/birthdaydlg.cpp 19 Jul 2004 21:27:07 -0000 1.26
+++ kalarm/birthdaydlg.cpp 7 Feb 2005 00:41:00 -0000 1.26.2.2
@@ -143,7 +143,7 @@
@@ -1229,7 +1229,7 @@
RCS file: /home/kde/kdepim/kalarm/daemon.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
-diff -u -r1.9 -r1.9.2.1
+diff -u -d -r1.9 -r1.9.2.1
--- kalarm/daemon.cpp 6 Jul 2004 23:46:07 -0000 1.9
+++ kalarm/daemon.cpp 22 Jan 2005 00:07:17 -0000 1.9.2.1
@@ -212,13 +212,15 @@
@@ -1267,7 +1267,7 @@
RCS file: /home/kde/kdepim/kalarm/editdlg.cpp,v
retrieving revision 1.128.2.3
retrieving revision 1.128.2.5
-diff -u -r1.128.2.3 -r1.128.2.5
+diff -u -d -r1.128.2.3 -r1.128.2.5
--- kalarm/editdlg.cpp 1 Sep 2004 11:21:19 -0000 1.128.2.3
+++ kalarm/editdlg.cpp 22 Dec 2004 22:47:51 -0000 1.128.2.5
@@ -165,8 +165,8 @@
@@ -1375,7 +1375,7 @@
RCS file: /home/kde/kdepim/kalarm/editdlg.h,v
retrieving revision 1.48.2.3
retrieving revision 1.48.2.4
-diff -u -r1.48.2.3 -r1.48.2.4
+diff -u -d -r1.48.2.3 -r1.48.2.4
--- kalarm/editdlg.h 1 Sep 2004 11:21:19 -0000 1.48.2.3
+++ kalarm/editdlg.h 22 Dec 2004 22:47:51 -0000 1.48.2.4
@@ -30,7 +30,6 @@
@@ -1409,7 +1409,7 @@
RCS file: /home/kde/kdepim/kalarm/kalarm.desktop,v
retrieving revision 1.138.2.2
retrieving revision 1.138.2.4
-diff -u -r1.138.2.2 -r1.138.2.4
+diff -u -d -r1.138.2.2 -r1.138.2.4
--- kalarm/kalarm.desktop 31 Aug 2004 07:22:58 -0000 1.138.2.2
+++ kalarm/kalarm.desktop 29 Dec 2004 21:44:52 -0000 1.138.2.4
@@ -8,6 +8,7 @@
@@ -1433,7 +1433,7 @@
RCS file: /home/kde/kdepim/kalarm/kalarm.h,v
retrieving revision 1.47.2.4
retrieving revision 1.47.2.5
-diff -u -r1.47.2.4 -r1.47.2.5
+diff -u -d -r1.47.2.4 -r1.47.2.5
--- kalarm/kalarm.h 27 Oct 2004 12:54:54 -0000 1.47.2.4
+++ kalarm/kalarm.h 30 Nov 2004 13:24:15 -0000 1.47.2.5
@@ -26,7 +26,7 @@
@@ -1450,7 +1450,7 @@
RCS file: /home/kde/kdepim/kalarm/kalarm.tray.desktop,v
retrieving revision 1.101.2.2
retrieving revision 1.101.2.4
-diff -u -r1.101.2.2 -r1.101.2.4
+diff -u -d -r1.101.2.2 -r1.101.2.4
--- kalarm/kalarm.tray.desktop 31 Aug 2004 07:22:58 -0000 1.101.2.2
+++ kalarm/kalarm.tray.desktop 29 Dec 2004 21:44:52 -0000 1.101.2.4
@@ -8,6 +8,7 @@
@@ -1474,7 +1474,7 @@
RCS file: /home/kde/kdepim/kalarm/messagewin.cpp,v
retrieving revision 1.92.2.1
retrieving revision 1.92.2.3
-diff -u -r1.92.2.1 -r1.92.2.3
+diff -u -d -r1.92.2.1 -r1.92.2.3
--- kalarm/messagewin.cpp 18 Aug 2004 12:31:53 -0000 1.92.2.1
+++ kalarm/messagewin.cpp 7 Feb 2005 11:29:00 -0000 1.92.2.3
@@ -1,7 +1,7 @@
@@ -1697,7 +1697,7 @@
RCS file: /home/kde/kdepim/kalarm/messagewin.h,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
-diff -u -r1.42.2.1 -r1.42.2.2
+diff -u -d -r1.42.2.1 -r1.42.2.2
--- kalarm/messagewin.h 18 Aug 2004 12:31:53 -0000 1.42.2.1
+++ kalarm/messagewin.h 6 Feb 2005 22:47:54 -0000 1.42.2.2
@@ -1,7 +1,7 @@
@@ -1771,7 +1771,7 @@
RCS file: /home/kde/kdepim/kalarm/prefdlg.cpp,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
-diff -u -r1.44.2.1 -r1.44.2.2
+diff -u -d -r1.44.2.1 -r1.44.2.2
--- kalarm/prefdlg.cpp 27 Nov 2004 12:30:33 -0000 1.44.2.1
+++ kalarm/prefdlg.cpp 5 Dec 2004 18:36:11 -0000 1.44.2.2
@@ -189,6 +189,9 @@
@@ -1978,7 +1978,7 @@
RCS file: /home/kde/kdepim/kalarm/preferences.cpp,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
-diff -u -r1.21.2.1 -r1.21.2.2
+diff -u -d -r1.21.2.1 -r1.21.2.2
--- kalarm/preferences.cpp 1 Oct 2004 06:38:34 -0000 1.21.2.1
+++ kalarm/preferences.cpp 6 Feb 2005 22:47:54 -0000 1.21.2.2
@@ -1,7 +1,7 @@
@@ -2027,7 +2027,7 @@
RCS file: /home/kde/kdepim/kalarm/preferences.h,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
-diff -u -r1.17.2.1 -r1.17.2.2
+diff -u -d -r1.17.2.1 -r1.17.2.2
--- kalarm/preferences.h 1 Oct 2004 06:38:34 -0000 1.17.2.1
+++ kalarm/preferences.h 6 Feb 2005 22:47:54 -0000 1.17.2.2
@@ -1,7 +1,7 @@
@@ -2068,7 +2068,7 @@
RCS file: /home/kde/kdepim/kalarm/recurrenceedit.cpp,v
retrieving revision 1.73.2.3
retrieving revision 1.73.2.4
-diff -u -r1.73.2.3 -r1.73.2.4
+diff -u -d -r1.73.2.3 -r1.73.2.4
--- kalarm/recurrenceedit.cpp 23 Aug 2004 02:05:36 -0000 1.73.2.3
+++ kalarm/recurrenceedit.cpp 5 Dec 2004 18:03:41 -0000 1.73.2.4
@@ -223,7 +223,7 @@
@@ -2124,7 +2124,7 @@
RCS file: /home/kde/kdepim/kalarm/specialactions.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
-diff -u -r1.3 -r1.3.2.1
+diff -u -d -r1.3 -r1.3.2.1
--- kalarm/specialactions.cpp 24 Jul 2004 14:00:01 -0000 1.3
+++ kalarm/specialactions.cpp 5 Dec 2004 18:03:41 -0000 1.3.2.1
@@ -157,7 +157,7 @@
@@ -2150,7 +2150,7 @@
RCS file: /home/kde/kdepim/kalarm/traywindow.cpp,v
retrieving revision 1.50.2.1
retrieving revision 1.50.2.2
-diff -u -r1.50.2.1 -r1.50.2.2
+diff -u -d -r1.50.2.1 -r1.50.2.2
--- kalarm/traywindow.cpp 27 Nov 2004 12:28:37 -0000 1.50.2.1
+++ kalarm/traywindow.cpp 7 Feb 2005 00:50:09 -0000 1.50.2.2
@@ -81,12 +81,8 @@
@@ -2183,7 +2183,7 @@
RCS file: /home/kde/kdepim/kalarm/widgets/spinbox.cpp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
-diff -u -r1.6 -r1.6.2.1
+diff -u -d -r1.6 -r1.6.2.1
--- kalarm/widgets/spinbox.cpp 9 Mar 2004 13:01:26 -0000 1.6
+++ kalarm/widgets/spinbox.cpp 30 Nov 2004 13:24:15 -0000 1.6.2.1
@@ -16,16 +16,6 @@
@@ -2219,7 +2219,7 @@
RCS file: /home/kde/kdepim/kalarm/widgets/spinbox2.cpp,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.3
-diff -u -r1.6.6.1 -r1.6.6.3
+diff -u -d -r1.6.6.1 -r1.6.6.3
--- kalarm/widgets/spinbox2.cpp 21 Aug 2004 18:11:20 -0000 1.6.6.1
+++ kalarm/widgets/spinbox2.cpp 16 Jan 2005 00:01:13 -0000 1.6.6.3
@@ -1,7 +1,7 @@
@@ -2311,7 +2311,7 @@
RCS file: /home/kde/kdepim/kalarm/widgets/spinbox2.h,v
retrieving revision 1.4
retrieving revision 1.4.6.1
-diff -u -r1.4 -r1.4.6.1
+diff -u -d -r1.4 -r1.4.6.1
--- kalarm/widgets/spinbox2.h 10 Dec 2003 19:39:10 -0000 1.4
+++ kalarm/widgets/spinbox2.h 30 Nov 2004 19:54:51 -0000 1.4.6.1
@@ -144,10 +144,11 @@
@@ -2333,7 +2333,7 @@
RCS file: /home/kde/kdepim/kalarmd/Attic/adcalendar.cpp,v
retrieving revision 1.13
retrieving revision 1.13.8.1
-diff -u -r1.13 -r1.13.8.1
+diff -u -d -r1.13 -r1.13.8.1
--- kalarmd/adcalendar.cpp 7 Mar 2003 22:09:26 -0000 1.13
+++ kalarmd/adcalendar.cpp 22 Feb 2005 21:12:45 -0000 1.13.8.1
@@ -2,7 +2,7 @@
@@ -2410,7 +2410,7 @@
RCS file: /home/kde/kdepim/kalarmd/Attic/adcalendarbase.cpp,v
retrieving revision 1.21
retrieving revision 1.21.6.1
-diff -u -r1.21 -r1.21.6.1
+diff -u -d -r1.21 -r1.21.6.1
--- kalarmd/adcalendarbase.cpp 26 Nov 2003 12:37:50 -0000 1.21
+++ kalarmd/adcalendarbase.cpp 22 Feb 2005 21:12:45 -0000 1.21.6.1
@@ -2,7 +2,7 @@
@@ -2468,7 +2468,7 @@
RCS file: /home/kde/kdepim/kalarmd/Attic/adcalendarbase.h,v
retrieving revision 1.15
retrieving revision 1.15.2.1
-diff -u -r1.15 -r1.15.2.1
+diff -u -d -r1.15 -r1.15.2.1
--- kalarmd/adcalendarbase.h 11 Jul 2004 12:22:29 -0000 1.15
+++ kalarmd/adcalendarbase.h 22 Feb 2005 21:12:45 -0000 1.15.2.1
@@ -2,7 +2,7 @@
@@ -2546,7 +2546,7 @@
RCS file: /home/kde/kdepim/kalarmd/Attic/kalarmd.autostart.desktop,v
retrieving revision 1.92.2.4
retrieving revision 1.92.2.7
-diff -u -r1.92.2.4 -r1.92.2.7
+diff -u -d -r1.92.2.4 -r1.92.2.7
--- kalarmd/kalarmd.autostart.desktop 28 Nov 2004 08:33:55 -0000 1.92.2.4
+++ kalarmd/kalarmd.autostart.desktop 5 Jan 2005 07:50:29 -0000 1.92.2.7
@@ -3,7 +3,7 @@
@@ -2588,7 +2588,7 @@
RCS file: /home/kde/kdepim/kalarmd/Attic/kalarmd.desktop,v
retrieving revision 1.99.2.2
retrieving revision 1.99.2.5
-diff -u -r1.99.2.2 -r1.99.2.5
+diff -u -d -r1.99.2.2 -r1.99.2.5
--- kalarmd/kalarmd.desktop 28 Nov 2004 08:33:55 -0000 1.99.2.2
+++ kalarmd/kalarmd.desktop 5 Jan 2005 07:50:29 -0000 1.99.2.5
@@ -3,7 +3,7 @@
@@ -2613,7 +2613,7 @@
RCS file: /home/kde/kdepim/kalarmd/Attic/main.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
-diff -u -r1.13 -r1.13.2.1
+diff -u -d -r1.13 -r1.13.2.1
--- kalarmd/main.cpp 20 Jun 2004 13:19:59 -0000 1.13
+++ kalarmd/main.cpp 22 Feb 2005 21:12:45 -0000 1.13.2.1
@@ -23,7 +23,7 @@
@@ -2639,7 +2639,7 @@
RCS file: /home/kde/kdepim/kandy/src/kandy.desktop,v
retrieving revision 1.130.2.10
retrieving revision 1.130.2.12
-diff -u -r1.130.2.10 -r1.130.2.12
+diff -u -d -r1.130.2.10 -r1.130.2.12
--- kandy/src/kandy.desktop 28 Nov 2004 08:33:56 -0000 1.130.2.10
+++ kandy/src/kandy.desktop 29 Dec 2004 21:44:53 -0000 1.130.2.12
@@ -5,6 +5,7 @@
@@ -2663,7 +2663,7 @@
RCS file: /home/kde/kdepim/karm/support/karm.desktop,v
retrieving revision 1.212.2.1
retrieving revision 1.212.2.2
-diff -u -r1.212.2.1 -r1.212.2.2
+diff -u -d -r1.212.2.1 -r1.212.2.2
--- karm/support/karm.desktop 24 Aug 2004 06:31:57 -0000 1.212.2.1
+++ karm/support/karm.desktop 12 Dec 2004 08:32:45 -0000 1.212.2.2
@@ -5,6 +5,7 @@
@@ -2679,7 +2679,7 @@
RCS file: /home/kde/kdepim/kfile-plugins/palm-databases/kfile_palm.desktop,v
retrieving revision 1.21.2.8
retrieving revision 1.21.2.9
-diff -u -r1.21.2.8 -r1.21.2.9
+diff -u -d -r1.21.2.8 -r1.21.2.9
--- kfile-plugins/palm-databases/kfile_palm.desktop 28 Nov 2004 08:33:56 -0000 1.21.2.8
+++ kfile-plugins/palm-databases/kfile_palm.desktop 29 Dec 2004 21:44:54 -0000 1.21.2.9
@@ -2,6 +2,7 @@
@@ -2695,7 +2695,7 @@
RCS file: /home/kde/kdepim/kfile-plugins/rfc822/kfile_rfc822.desktop,v
retrieving revision 1.74.2.4
retrieving revision 1.74.2.5
-diff -u -r1.74.2.4 -r1.74.2.5
+diff -u -d -r1.74.2.4 -r1.74.2.5
--- kfile-plugins/rfc822/kfile_rfc822.desktop 28 Nov 2004 08:33:56 -0000 1.74.2.4
+++ kfile-plugins/rfc822/kfile_rfc822.desktop 29 Dec 2004 21:44:54 -0000 1.74.2.5
@@ -2,6 +2,7 @@
@@ -2711,7 +2711,7 @@
RCS file: /home/kde/kdepim/kfile-plugins/vcf/kfile_vcf.desktop,v
retrieving revision 1.63.2.3
retrieving revision 1.63.2.4
-diff -u -r1.63.2.3 -r1.63.2.4
+diff -u -d -r1.63.2.3 -r1.63.2.4
--- kfile-plugins/vcf/kfile_vcf.desktop 28 Nov 2004 08:33:57 -0000 1.63.2.3
+++ kfile-plugins/vcf/kfile_vcf.desktop 29 Dec 2004 21:44:54 -0000 1.63.2.4
@@ -3,6 +3,7 @@
@@ -2727,7 +2727,7 @@
RCS file: /home/kde/kdepim/kioslaves/imap4/mimeheader.cc,v
retrieving revision 1.19
retrieving revision 1.19.4.2
-diff -u -r1.19 -r1.19.4.2
+diff -u -d -r1.19 -r1.19.4.2
--- kioslaves/imap4/mimeheader.cc 12 Jun 2004 21:36:57 -0000 1.19
+++ kioslaves/imap4/mimeheader.cc 27 Dec 2004 18:12:16 -0000 1.19.4.2
@@ -85,9 +85,8 @@
@@ -2756,7 +2756,7 @@
RCS file: /home/kde/kdepim/kitchensync/devicemimetypes/Attic/cellphone.desktop,v
retrieving revision 1.61.2.8
retrieving revision 1.61.2.9
-diff -u -r1.61.2.8 -r1.61.2.9
+diff -u -d -r1.61.2.8 -r1.61.2.9
--- kitchensync/devicemimetypes/cellphone.desktop 28 Nov 2004 08:33:57 -0000 1.61.2.8
+++ kitchensync/devicemimetypes/cellphone.desktop 5 Jan 2005 07:50:29 -0000 1.61.2.9
@@ -4,6 +4,7 @@
@@ -2772,7 +2772,7 @@
RCS file: /home/kde/kdepim/kitchensync/devicemimetypes/Attic/pda.desktop,v
retrieving revision 1.46.2.2
retrieving revision 1.46.2.4
-diff -u -r1.46.2.2 -r1.46.2.4
+diff -u -d -r1.46.2.2 -r1.46.2.4
--- kitchensync/devicemimetypes/pda.desktop 28 Nov 2004 08:33:57 -0000 1.46.2.2
+++ kitchensync/devicemimetypes/pda.desktop 29 Dec 2004 21:44:54 -0000 1.46.2.4
@@ -4,6 +4,7 @@
@@ -2796,7 +2796,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/backup/backup.desktop,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
-diff -u -r1.32.2.2 -r1.32.2.3
+diff -u -d -r1.32.2.2 -r1.32.2.3
--- kitchensync/kitchensync/backup/backup.desktop 28 Nov 2004 08:33:57 -0000 1.32.2.2
+++ kitchensync/kitchensync/backup/backup.desktop 29 Dec 2004 21:44:55 -0000 1.32.2.3
@@ -1,6 +1,7 @@
@@ -2812,7 +2812,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/backup/restore.desktop,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.9
-diff -u -r1.18.2.8 -r1.18.2.9
+diff -u -d -r1.18.2.8 -r1.18.2.9
--- kitchensync/kitchensync/backup/restore.desktop 13 Nov 2004 07:20:50 -0000 1.18.2.8
+++ kitchensync/kitchensync/backup/restore.desktop 29 Dec 2004 21:44:55 -0000 1.18.2.9
@@ -1,6 +1,7 @@
@@ -2828,7 +2828,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/debugger/debugger.desktop,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
-diff -u -r1.34.2.2 -r1.34.2.3
+diff -u -d -r1.34.2.2 -r1.34.2.3
--- kitchensync/kitchensync/debugger/debugger.desktop 28 Nov 2004 08:33:57 -0000 1.34.2.2
+++ kitchensync/kitchensync/debugger/debugger.desktop 29 Dec 2004 21:44:55 -0000 1.34.2.3
@@ -1,6 +1,8 @@
@@ -2845,7 +2845,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/fileview/fileview.desktop,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.5
-diff -u -r1.41.2.3 -r1.41.2.5
+diff -u -d -r1.41.2.3 -r1.41.2.5
--- kitchensync/kitchensync/fileview/fileview.desktop 28 Nov 2004 08:33:58 -0000 1.41.2.3
+++ kitchensync/kitchensync/fileview/fileview.desktop 29 Dec 2004 21:44:55 -0000 1.41.2.5
@@ -1,6 +1,7 @@
@@ -2869,7 +2869,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/lib/kitchensync.desktop,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.4
-diff -u -r1.40.2.2 -r1.40.2.4
+diff -u -d -r1.40.2.2 -r1.40.2.4
--- kitchensync/kitchensync/lib/kitchensync.desktop 24 Oct 2004 07:05:56 -0000 1.40.2.2
+++ kitchensync/kitchensync/lib/kitchensync.desktop 29 Dec 2004 21:44:56 -0000 1.40.2.4
@@ -2,6 +2,7 @@
@@ -2893,7 +2893,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/organizer/Attic/organizer.desktop,v
retrieving revision 1.45.2.3
retrieving revision 1.45.2.5
-diff -u -r1.45.2.3 -r1.45.2.5
+diff -u -d -r1.45.2.3 -r1.45.2.5
--- kitchensync/kitchensync/organizer/organizer.desktop 28 Nov 2004 08:33:58 -0000 1.45.2.3
+++ kitchensync/kitchensync/organizer/organizer.desktop 5 Jan 2005 07:50:30 -0000 1.45.2.5
@@ -1,6 +1,7 @@
@@ -2917,7 +2917,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/overview/overview.desktop,v
retrieving revision 1.48.2.2
retrieving revision 1.48.2.3
-diff -u -r1.48.2.2 -r1.48.2.3
+diff -u -d -r1.48.2.2 -r1.48.2.3
--- kitchensync/kitchensync/overview/overview.desktop 28 Nov 2004 08:33:58 -0000 1.48.2.2
+++ kitchensync/kitchensync/overview/overview.desktop 12 Dec 2004 08:32:46 -0000 1.48.2.3
@@ -17,6 +17,7 @@
@@ -2933,7 +2933,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/syncerpart/syncerpart.desktop,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
-diff -u -r1.36.2.1 -r1.36.2.2
+diff -u -d -r1.36.2.1 -r1.36.2.2
--- kitchensync/kitchensync/syncerpart/syncerpart.desktop 24 Aug 2004 06:32:07 -0000 1.36.2.1
+++ kitchensync/kitchensync/syncerpart/syncerpart.desktop 29 Dec 2004 21:44:56 -0000 1.36.2.2
@@ -1,6 +1,7 @@
@@ -2949,7 +2949,7 @@
RCS file: /home/kde/kdepim/kitchensync/kitchensync/viewer/viewer.desktop,v
retrieving revision 1.20.2.9
retrieving revision 1.20.2.11
-diff -u -r1.20.2.9 -r1.20.2.11
+diff -u -d -r1.20.2.9 -r1.20.2.11
--- kitchensync/kitchensync/viewer/viewer.desktop 28 Nov 2004 08:33:59 -0000 1.20.2.9
+++ kitchensync/kitchensync/viewer/viewer.desktop 4 Jan 2005 07:39:01 -0000 1.20.2.11
@@ -1,6 +1,8 @@
@@ -2966,7 +2966,7 @@
RCS file: /home/kde/kdepim/kitchensync/klockfile/Attic/ksharedfile.desktop,v
retrieving revision 1.72.2.3
retrieving revision 1.72.2.4
-diff -u -r1.72.2.3 -r1.72.2.4
+diff -u -d -r1.72.2.3 -r1.72.2.4
--- kitchensync/klockfile/ksharedfile.desktop 28 Nov 2004 08:33:59 -0000 1.72.2.3
+++ kitchensync/klockfile/ksharedfile.desktop 12 Dec 2004 08:32:46 -0000 1.72.2.4
@@ -26,6 +26,7 @@
@@ -2990,7 +2990,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/konnector.desktop,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.4
-diff -u -r1.20.2.2 -r1.20.2.4
+diff -u -d -r1.20.2.2 -r1.20.2.4
--- kitchensync/libkonnector2/konnector.desktop 28 Nov 2004 08:33:59 -0000 1.20.2.2
+++ kitchensync/libkonnector2/konnector.desktop 29 Dec 2004 21:44:56 -0000 1.20.2.4
@@ -3,6 +3,7 @@
@@ -3014,7 +3014,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/agenda/Attic/agenda.desktop,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.4
-diff -u -r1.17.2.2 -r1.17.2.4
+diff -u -d -r1.17.2.2 -r1.17.2.4
--- kitchensync/libkonnector2/plugins/agenda/agenda.desktop 13 Nov 2004 07:20:50 -0000 1.17.2.2
+++ kitchensync/libkonnector2/plugins/agenda/agenda.desktop 29 Dec 2004 21:44:57 -0000 1.17.2.4
@@ -5,6 +5,8 @@
@@ -3217,7 +3217,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.3
-diff -u -r1.33.2.1 -r1.33.2.3
+diff -u -d -r1.33.2.1 -r1.33.2.3
--- kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop 24 Aug 2004 06:32:08 -0000 1.33.2.1
+++ kitchensync/libkonnector2/plugins/dummy/dummykonnector.desktop 26 Jan 2005 08:10:28 -0000 1.33.2.3
@@ -5,6 +5,7 @@
@@ -3241,7 +3241,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop,v
retrieving revision 1.18.2.10
retrieving revision 1.18.2.11
-diff -u -r1.18.2.10 -r1.18.2.11
+diff -u -d -r1.18.2.10 -r1.18.2.11
--- kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop 28 Nov 2004 08:33:59 -0000 1.18.2.10
+++ kitchensync/libkonnector2/plugins/kabc/kabckonnector.desktop 29 Dec 2004 21:44:57 -0000 1.18.2.11
@@ -5,6 +5,7 @@
@@ -3257,7 +3257,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop,v
retrieving revision 1.19.2.10
retrieving revision 1.19.2.11
-diff -u -r1.19.2.10 -r1.19.2.11
+diff -u -d -r1.19.2.10 -r1.19.2.11
--- kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop 28 Nov 2004 08:34:00 -0000 1.19.2.10
+++ kitchensync/libkonnector2/plugins/kcal/kcalkonnector.desktop 29 Dec 2004 21:44:58 -0000 1.19.2.11
@@ -5,6 +5,7 @@
@@ -3273,7 +3273,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/local/localkonnector.desktop,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
-diff -u -r1.36.2.2 -r1.36.2.3
+diff -u -d -r1.36.2.2 -r1.36.2.3
--- kitchensync/libkonnector2/plugins/local/localkonnector.desktop 24 Oct 2004 07:05:57 -0000 1.36.2.2
+++ kitchensync/libkonnector2/plugins/local/localkonnector.desktop 29 Dec 2004 21:44:58 -0000 1.36.2.3
@@ -5,6 +5,7 @@
@@ -3289,7 +3289,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop,v
retrieving revision 1.18.2.8
retrieving revision 1.18.2.10
-diff -u -r1.18.2.8 -r1.18.2.10
+diff -u -d -r1.18.2.8 -r1.18.2.10
--- kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop 13 Nov 2004 07:20:51 -0000 1.18.2.8
+++ kitchensync/libkonnector2/plugins/remote/remotekonnector.desktop 26 Jan 2005 08:10:28 -0000 1.18.2.10
@@ -5,6 +5,7 @@
@@ -3313,7 +3313,7 @@
RCS file: /home/kde/kdepim/kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
-diff -u -r1.35.2.4 -r1.35.2.5
+diff -u -d -r1.35.2.4 -r1.35.2.5
--- kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop 24 Oct 2004 07:05:57 -0000 1.35.2.4
+++ kitchensync/libkonnector2/plugins/threadedkonnector/threadedkonnector.desktop 29 Dec 2004 21:44:58 -0000 1.35.2.5
@@ -5,6 +5,7 @@
@@ -3329,7 +3329,7 @@
RCS file: /home/kde/kdepim/kmail/KMail.desktop,v
retrieving revision 1.282.2.3
retrieving revision 1.282.2.5
-diff -u -r1.282.2.3 -r1.282.2.5
+diff -u -d -r1.282.2.3 -r1.282.2.5
--- kmail/KMail.desktop 26 Nov 2004 08:05:19 -0000 1.282.2.3
+++ kmail/KMail.desktop 9 Jan 2005 07:49:20 -0000 1.282.2.5
@@ -44,7 +44,6 @@
@@ -3353,7 +3353,7 @@
RCS file: /home/kde/kdepim/kmail/antispamwizard.cpp,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
-diff -u -r1.36.2.4 -r1.36.2.5
+diff -u -d -r1.36.2.4 -r1.36.2.5
--- kmail/antispamwizard.cpp 3 Nov 2004 21:02:27 -0000 1.36.2.4
+++ kmail/antispamwizard.cpp 2 Jan 2005 19:33:14 -0000 1.36.2.5
@@ -356,13 +356,13 @@
@@ -3377,7 +3377,7 @@
RCS file: /home/kde/kdepim/kmail/application_octetstream.desktop,v
retrieving revision 1.21.2.8
retrieving revision 1.21.2.9
-diff -u -r1.21.2.8 -r1.21.2.9
+diff -u -d -r1.21.2.8 -r1.21.2.9
--- kmail/application_octetstream.desktop 13 Nov 2004 07:20:51 -0000 1.21.2.8
+++ kmail/application_octetstream.desktop 29 Dec 2004 21:44:59 -0000 1.21.2.9
@@ -1,6 +1,7 @@
@@ -3401,7 +3401,7 @@
RCS file: /home/kde/kdepim/kmail/dcopimap.desktop,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.4
-diff -u -r1.9.2.2 -r1.9.2.4
+diff -u -d -r1.9.2.2 -r1.9.2.4
--- kmail/dcopimap.desktop 24 Oct 2004 07:05:57 -0000 1.9.2.2
+++ kmail/dcopimap.desktop 9 Jan 2005 07:49:20 -0000 1.9.2.4
@@ -3,6 +3,7 @@
@@ -3425,7 +3425,7 @@
RCS file: /home/kde/kdepim/kmail/dcopmail.desktop,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.4
-diff -u -r1.42.2.2 -r1.42.2.4
+diff -u -d -r1.42.2.2 -r1.42.2.4
--- kmail/dcopmail.desktop 24 Oct 2004 07:05:57 -0000 1.42.2.2
+++ kmail/dcopmail.desktop 9 Jan 2005 07:49:20 -0000 1.42.2.4
@@ -3,6 +3,7 @@
@@ -3449,7 +3449,7 @@
RCS file: /home/kde/kdepim/kmail/eventsrc,v
retrieving revision 1.83.2.9
retrieving revision 1.83.2.12
-diff -u -r1.83.2.9 -r1.83.2.12
+diff -u -d -r1.83.2.9 -r1.83.2.12
--- kmail/eventsrc 13 Nov 2004 07:20:51 -0000 1.83.2.9
+++ kmail/eventsrc 10 Jan 2005 09:02:03 -0000 1.83.2.12
@@ -8,6 +8,7 @@
@@ -3491,7 +3491,7 @@
RCS file: /home/kde/kdepim/kmail/headerlistquicksearch.cpp,v
retrieving revision 1.5
retrieving revision 1.5.2.1
-diff -u -r1.5 -r1.5.2.1
+diff -u -d -r1.5 -r1.5.2.1
--- kmail/headerlistquicksearch.cpp 31 Jul 2004 13:26:40 -0000 1.5
+++ kmail/headerlistquicksearch.cpp 24 Jan 2005 20:56:19 -0000 1.5.2.1
@@ -73,6 +73,16 @@
@@ -3516,7 +3516,7 @@
RCS file: /home/kde/kdepim/kmail/imapjob.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
-diff -u -r1.13 -r1.13.2.1
+diff -u -d -r1.13 -r1.13.2.1
--- kmail/imapjob.h 1 Jun 2004 22:48:51 -0000 1.13
+++ kmail/imapjob.h 28 Dec 2004 19:54:13 -0000 1.13.2.1
@@ -55,7 +55,7 @@
@@ -3533,7 +3533,7 @@
RCS file: /home/kde/kdepim/kmail/kmail_config_appearance.desktop,v
retrieving revision 1.33.2.11
retrieving revision 1.33.2.14
-diff -u -r1.33.2.11 -r1.33.2.14
+diff -u -d -r1.33.2.11 -r1.33.2.14
--- kmail/kmail_config_appearance.desktop 26 Nov 2004 08:05:19 -0000 1.33.2.11
+++ kmail/kmail_config_appearance.desktop 9 Jan 2005 07:49:20 -0000 1.33.2.14
@@ -13,6 +13,7 @@
@@ -3581,7 +3581,7 @@
RCS file: /home/kde/kdepim/kmail/kmail_config_composer.desktop,v
retrieving revision 1.24.2.10
retrieving revision 1.24.2.13
-diff -u -r1.24.2.10 -r1.24.2.13
+diff -u -d -r1.24.2.10 -r1.24.2.13
--- kmail/kmail_config_composer.desktop 13 Nov 2004 07:20:51 -0000 1.24.2.10
+++ kmail/kmail_config_composer.desktop 26 Jan 2005 08:10:29 -0000 1.24.2.13
@@ -25,6 +25,7 @@
@@ -3629,7 +3629,7 @@
RCS file: /home/kde/kdepim/kmail/kmail_config_identity.desktop,v
retrieving revision 1.23.2.11
retrieving revision 1.23.2.14
-diff -u -r1.23.2.11 -r1.23.2.14
+diff -u -d -r1.23.2.11 -r1.23.2.14
--- kmail/kmail_config_identity.desktop 13 Nov 2004 07:20:51 -0000 1.23.2.11
+++ kmail/kmail_config_identity.desktop 26 Jan 2005 08:10:29 -0000 1.23.2.14
@@ -13,8 +13,10 @@
@@ -3691,7 +3691,7 @@
RCS file: /home/kde/kdepim/kmail/kmail_config_misc.desktop,v
retrieving revision 1.25.2.13
retrieving revision 1.25.2.16
-diff -u -r1.25.2.13 -r1.25.2.16
+diff -u -d -r1.25.2.13 -r1.25.2.16
--- kmail/kmail_config_misc.desktop 26 Nov 2004 08:05:19 -0000 1.25.2.13
+++ kmail/kmail_config_misc.desktop 23 Jan 2005 08:20:13 -0000 1.25.2.16
@@ -13,6 +13,7 @@
@@ -3747,7 +3747,7 @@
RCS file: /home/kde/kdepim/kmail/Attic/kmail_config_network.desktop,v
retrieving revision 1.34.2.13
retrieving revision 1.34.2.19
-diff -u -r1.34.2.13 -r1.34.2.19
+diff -u -d -r1.34.2.13 -r1.34.2.19
--- kmail/kmail_config_network.desktop 26 Nov 2004 08:05:19 -0000 1.34.2.13
+++ kmail/kmail_config_network.desktop 26 Jan 2005 08:10:29 -0000 1.34.2.19
@@ -13,6 +13,7 @@
@@ -3814,7 +3814,7 @@
RCS file: /home/kde/kdepim/kmail/kmail_config_security.desktop,v
retrieving revision 1.27.2.13
retrieving revision 1.27.2.16
-diff -u -r1.27.2.13 -r1.27.2.16
+diff -u -d -r1.27.2.13 -r1.27.2.16
--- kmail/kmail_config_security.desktop 26 Nov 2004 08:05:19 -0000 1.27.2.13
+++ kmail/kmail_config_security.desktop 9 Jan 2005 07:49:20 -0000 1.27.2.16
@@ -13,12 +13,14 @@
@@ -3869,7 +3869,7 @@
RCS file: /home/kde/kdepim/kmail/kmcommands.cpp,v
retrieving revision 1.163.2.6
retrieving revision 1.163.2.7
-diff -u -r1.163.2.6 -r1.163.2.7
+diff -u -d -r1.163.2.6 -r1.163.2.7
--- kmail/kmcommands.cpp 18 Oct 2004 20:17:42 -0000 1.163.2.6
+++ kmail/kmcommands.cpp 3 Dec 2004 12:39:18 -0000 1.163.2.7
@@ -1870,6 +1870,11 @@
@@ -3914,7 +3914,7 @@
RCS file: /home/kde/kdepim/kmail/kmcommands.h,v
retrieving revision 1.46.2.4
retrieving revision 1.46.2.5
-diff -u -r1.46.2.4 -r1.46.2.5
+diff -u -d -r1.46.2.4 -r1.46.2.5
--- kmail/kmcommands.h 18 Oct 2004 20:17:42 -0000 1.46.2.4
+++ kmail/kmcommands.h 3 Dec 2004 12:39:18 -0000 1.46.2.5
@@ -6,6 +6,7 @@
@@ -3938,7 +3938,7 @@
RCS file: /home/kde/kdepim/kmail/kmcomposewin.cpp,v
retrieving revision 1.851.2.16
retrieving revision 1.851.2.17
-diff -u -r1.851.2.16 -r1.851.2.17
+diff -u -d -r1.851.2.16 -r1.851.2.17
--- kmail/kmcomposewin.cpp 17 Nov 2004 12:54:06 -0000 1.851.2.16
+++ kmail/kmcomposewin.cpp 10 Dec 2004 21:06:34 -0000 1.851.2.17
@@ -643,6 +643,8 @@
@@ -3955,7 +3955,7 @@
RCS file: /home/kde/kdepim/kmail/kmheaders.cpp,v
retrieving revision 1.658.2.8
retrieving revision 1.658.2.10
-diff -u -r1.658.2.8 -r1.658.2.10
+diff -u -d -r1.658.2.8 -r1.658.2.10
--- kmail/kmheaders.cpp 19 Nov 2004 11:46:04 -0000 1.658.2.8
+++ kmail/kmheaders.cpp 24 Jan 2005 20:56:19 -0000 1.658.2.10
@@ -1251,7 +1251,8 @@
@@ -3982,7 +3982,7 @@
RCS file: /home/kde/kdepim/kmail/kmheaders.h,v
retrieving revision 1.157
retrieving revision 1.157.2.1
-diff -u -r1.157 -r1.157.2.1
+diff -u -d -r1.157 -r1.157.2.1
--- kmail/kmheaders.h 5 Jul 2004 17:00:49 -0000 1.157
+++ kmail/kmheaders.h 24 Jan 2005 20:56:19 -0000 1.157.2.1
@@ -169,14 +169,21 @@
@@ -4016,7 +4016,7 @@
RCS file: /home/kde/kdepim/kmail/kmsender.cpp,v
retrieving revision 1.220.2.2
retrieving revision 1.220.2.3
-diff -u -r1.220.2.2 -r1.220.2.3
+diff -u -d -r1.220.2.2 -r1.220.2.3
--- kmail/kmsender.cpp 16 Oct 2004 09:36:41 -0000 1.220.2.2
+++ kmail/kmsender.cpp 3 Dec 2004 14:38:42 -0000 1.220.2.3
@@ -742,11 +742,10 @@
@@ -4048,7 +4048,7 @@
RCS file: /home/kde/kdepim/kmail/mboxjob.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
-diff -u -r1.7 -r1.7.2.1
+diff -u -d -r1.7 -r1.7.2.1
--- kmail/mboxjob.h 7 May 2004 21:27:44 -0000 1.7
+++ kmail/mboxjob.h 28 Dec 2004 19:54:13 -0000 1.7.2.1
@@ -41,7 +41,7 @@
@@ -4065,7 +4065,7 @@
RCS file: /home/kde/kdepim/kmail/messagecomposer.cpp,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.8
-diff -u -r1.28.2.6 -r1.28.2.8
+diff -u -d -r1.28.2.6 -r1.28.2.8
--- kmail/messagecomposer.cpp 30 Oct 2004 21:25:25 -0000 1.28.2.6
+++ kmail/messagecomposer.cpp 5 Feb 2005 21:34:31 -0000 1.28.2.8
@@ -182,6 +182,27 @@
@@ -4434,7 +4434,7 @@
RCS file: /home/kde/kdepim/kmail/messagecomposer.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
-diff -u -r1.4.2.1 -r1.4.2.2
+diff -u -d -r1.4.2.1 -r1.4.2.2
--- kmail/messagecomposer.h 7 Oct 2004 11:05:00 -0000 1.4.2.1
+++ kmail/messagecomposer.h 26 Jan 2005 17:12:05 -0000 1.4.2.2
@@ -221,6 +221,7 @@
@@ -4445,12 +4445,77 @@
bool mSigningRequested, mEncryptionRequested;
bool mDoSign, mDoEncrypt;
unsigned int mAllowedCryptoMessageFormats;
+Index: kmail/rulewidgethandlermanager.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/rulewidgethandlermanager.cpp,v
+retrieving revision 1.11.2.1
+retrieving revision 1.11.2.2
+diff -u -d -r1.11.2.1 -r1.11.2.2
+--- kmail/rulewidgethandlermanager.cpp 19 Oct 2004 19:54:52 -0000 1.11.2.1
++++ kmail/rulewidgethandlermanager.cpp 3 Mar 2005 17:32:10 -0000 1.11.2.2
+@@ -208,7 +208,8 @@
+
+ KMail::RuleWidgetHandlerManager::~RuleWidgetHandlerManager()
+ {
+- for_each( mHandlers.begin(), mHandlers.end(), DeleteAndSetToZero<RuleWidgetHandler> );
++ for_each( mHandlers.begin(), mHandlers.end(),
++ DeleteAndSetToZero<RuleWidgetHandler>() );
+ }
+
+ void KMail::RuleWidgetHandlerManager::registerHandler( const RuleWidgetHandler * handler )
+Index: kmail/stl_util.h
+===================================================================
+RCS file: /home/kde/kdepim/kmail/stl_util.h,v
+retrieving revision 1.1.2.2
+retrieving revision 1.1.2.4
+diff -u -d -r1.1.2.2 -r1.1.2.4
+--- kmail/stl_util.h 18 Oct 2004 13:20:39 -0000 1.1.2.2
++++ kmail/stl_util.h 3 Mar 2005 17:48:42 -0000 1.1.2.4
+@@ -33,9 +33,9 @@
+ #define __KDEPIM__KMAIL__STL_UTIL_H__
+
+ template <typename T>
+-static inline void DeleteAndSetToZero( const T* & t ) {
+- delete t; t = 0;
+-}
++struct DeleteAndSetToZero {
++ void operator()( const T * & t ) { delete t; t = 0; }
++};
+
+ template <typename T>
+ static inline void deleteAll( T & c ) {
+Index: kmail/urlhandlermanager.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/urlhandlermanager.cpp,v
+retrieving revision 1.12.2.3
+retrieving revision 1.12.2.4
+diff -u -d -r1.12.2.3 -r1.12.2.4
+--- kmail/urlhandlermanager.cpp 19 Oct 2004 19:54:52 -0000 1.12.2.3
++++ kmail/urlhandlermanager.cpp 3 Mar 2005 17:32:10 -0000 1.12.2.4
+@@ -153,7 +153,7 @@
+
+ KMail::URLHandlerManager::BodyPartURLHandlerManager::~BodyPartURLHandlerManager() {
+ for_each( mHandlers.begin(), mHandlers.end(),
+- DeleteAndSetToZero<Interface::BodyPartURLHandler> );
++ DeleteAndSetToZero<Interface::BodyPartURLHandler>() );
+ }
+
+ void KMail::URLHandlerManager::BodyPartURLHandlerManager::registerHandler( const Interface::BodyPartURLHandler * handler ) {
+@@ -253,7 +253,7 @@
+
+ KMail::URLHandlerManager::~URLHandlerManager() {
+ for_each( mHandlers.begin(), mHandlers.end(),
+- DeleteAndSetToZero<URLHandler> );
++ DeleteAndSetToZero<URLHandler>() );
+ }
+
+ void KMail::URLHandlerManager::registerHandler( const URLHandler * handler ) {
Index: kmail/profiles/profile-default-rc.desktop
===================================================================
RCS file: /home/kde/kdepim/kmail/profiles/profile-default-rc.desktop,v
retrieving revision 1.99.2.3
retrieving revision 1.99.2.6
-diff -u -r1.99.2.3 -r1.99.2.6
+diff -u -d -r1.99.2.3 -r1.99.2.6
--- kmail/profiles/profile-default-rc.desktop 26 Nov 2004 08:05:19 -0000 1.99.2.3
+++ kmail/profiles/profile-default-rc.desktop 29 Jan 2005 08:00:56 -0000 1.99.2.6
@@ -29,9 +29,8 @@
@@ -4485,7 +4550,7 @@
RCS file: /home/kde/kdepim/kmail/profiles/profile-high-contrast-rc.desktop,v
retrieving revision 1.121.2.3
retrieving revision 1.121.2.5
-diff -u -r1.121.2.3 -r1.121.2.5
+diff -u -d -r1.121.2.3 -r1.121.2.5
--- kmail/profiles/profile-high-contrast-rc.desktop 29 Sep 2004 14:06:30 -0000 1.121.2.3
+++ kmail/profiles/profile-high-contrast-rc.desktop 26 Jan 2005 08:10:29 -0000 1.121.2.5
@@ -1,5 +1,6 @@
@@ -4508,7 +4573,7 @@
RCS file: /home/kde/kdepim/kmail/profiles/profile-purist-rc.desktop,v
retrieving revision 1.87.2.2
retrieving revision 1.87.2.3
-diff -u -r1.87.2.2 -r1.87.2.3
+diff -u -d -r1.87.2.2 -r1.87.2.3
--- kmail/profiles/profile-purist-rc.desktop 10 Nov 2004 07:37:27 -0000 1.87.2.2
+++ kmail/profiles/profile-purist-rc.desktop 9 Jan 2005 07:49:20 -0000 1.87.2.3
@@ -23,6 +23,7 @@
@@ -4524,7 +4589,7 @@
RCS file: /home/kde/kdepim/kmail/profiles/profile-secure-rc.desktop,v
retrieving revision 1.132.2.2
retrieving revision 1.132.2.4
-diff -u -r1.132.2.2 -r1.132.2.4
+diff -u -d -r1.132.2.2 -r1.132.2.4
--- kmail/profiles/profile-secure-rc.desktop 31 Aug 2004 07:23:13 -0000 1.132.2.2
+++ kmail/profiles/profile-secure-rc.desktop 9 Jan 2005 07:49:20 -0000 1.132.2.4
@@ -1,5 +1,6 @@
@@ -4555,7 +4620,7 @@
RCS file: /home/kde/kdepim/kmobile/kmobile.desktop,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.3
-diff -u -r1.39.2.1 -r1.39.2.3
+diff -u -d -r1.39.2.1 -r1.39.2.3
--- kmobile/kmobile.desktop 24 Aug 2004 06:32:15 -0000 1.39.2.1
+++ kmobile/kmobile.desktop 9 Jan 2005 07:49:21 -0000 1.39.2.3
@@ -14,6 +14,7 @@
@@ -4587,7 +4652,7 @@
RCS file: /home/kde/kdepim/kmobile/libkmobile.desktop,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
-diff -u -r1.31.2.2 -r1.31.2.3
+diff -u -d -r1.31.2.2 -r1.31.2.3
--- kmobile/libkmobile.desktop 24 Oct 2004 07:05:58 -0000 1.31.2.2
+++ kmobile/libkmobile.desktop 29 Dec 2004 21:45:00 -0000 1.31.2.3
@@ -3,6 +3,7 @@
@@ -4603,7 +4668,7 @@
RCS file: /home/kde/kdepim/kmobile/devices/digicam/libkmobile_digicam.desktop,v
retrieving revision 1.52.2.2
retrieving revision 1.52.2.5
-diff -u -r1.52.2.2 -r1.52.2.5
+diff -u -d -r1.52.2.2 -r1.52.2.5
--- kmobile/devices/digicam/libkmobile_digicam.desktop 10 Nov 2004 07:37:27 -0000 1.52.2.2
+++ kmobile/devices/digicam/libkmobile_digicam.desktop 26 Jan 2005 08:10:29 -0000 1.52.2.5
@@ -15,6 +15,7 @@
@@ -4635,7 +4700,7 @@
RCS file: /home/kde/kdepim/kmobile/devices/gammu/libkmobile_gammu.desktop,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
-diff -u -r1.39.2.3 -r1.39.2.4
+diff -u -d -r1.39.2.3 -r1.39.2.4
--- kmobile/devices/gammu/libkmobile_gammu.desktop 24 Oct 2004 07:05:58 -0000 1.39.2.3
+++ kmobile/devices/gammu/libkmobile_gammu.desktop 29 Dec 2004 21:45:00 -0000 1.39.2.4
@@ -1,6 +1,7 @@
@@ -4659,7 +4724,7 @@
RCS file: /home/kde/kdepim/kmobile/devices/gnokii/libkmobile_gnokii.desktop,v
retrieving revision 1.41.2.2
retrieving revision 1.41.2.3
-diff -u -r1.41.2.2 -r1.41.2.3
+diff -u -d -r1.41.2.2 -r1.41.2.3
--- kmobile/devices/gnokii/libkmobile_gnokii.desktop 24 Oct 2004 07:05:58 -0000 1.41.2.2
+++ kmobile/devices/gnokii/libkmobile_gnokii.desktop 29 Dec 2004 21:45:01 -0000 1.41.2.3
@@ -1,6 +1,7 @@
@@ -4683,7 +4748,7 @@
RCS file: /home/kde/kdepim/kmobile/devices/skeleton/libkmobile_skeleton.desktop,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
-diff -u -r1.38.2.1 -r1.38.2.2
+diff -u -d -r1.38.2.1 -r1.38.2.2
--- kmobile/devices/skeleton/libkmobile_skeleton.desktop 24 Aug 2004 06:32:16 -0000 1.38.2.1
+++ kmobile/devices/skeleton/libkmobile_skeleton.desktop 29 Dec 2004 21:45:01 -0000 1.38.2.2
@@ -1,6 +1,7 @@
@@ -4707,7 +4772,7 @@
RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_addressbook.desktop,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
-diff -u -r1.38.2.1 -r1.38.2.2
+diff -u -d -r1.38.2.1 -r1.38.2.2
--- kmobile/kioslave/mimetypes/mobile_addressbook.desktop 24 Aug 2004 06:32:16 -0000 1.38.2.1
+++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop 29 Dec 2004 21:45:01 -0000 1.38.2.2
@@ -1,6 +1,7 @@
@@ -4723,7 +4788,7 @@
RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_calendar.desktop,v
retrieving revision 1.40.2.3
retrieving revision 1.40.2.4
-diff -u -r1.40.2.3 -r1.40.2.4
+diff -u -d -r1.40.2.3 -r1.40.2.4
--- kmobile/kioslave/mimetypes/mobile_calendar.desktop 10 Nov 2004 07:37:28 -0000 1.40.2.3
+++ kmobile/kioslave/mimetypes/mobile_calendar.desktop 29 Dec 2004 21:45:01 -0000 1.40.2.4
@@ -1,6 +1,7 @@
@@ -4739,7 +4804,7 @@
RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_device.desktop,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.3
-diff -u -r1.37.2.1 -r1.37.2.3
+diff -u -d -r1.37.2.1 -r1.37.2.3
--- kmobile/kioslave/mimetypes/mobile_device.desktop 24 Aug 2004 06:32:17 -0000 1.37.2.1
+++ kmobile/kioslave/mimetypes/mobile_device.desktop 9 Jan 2005 07:49:21 -0000 1.37.2.3
@@ -1,8 +1,10 @@
@@ -4766,7 +4831,7 @@
RCS file: /home/kde/kdepim/kmobile/kioslave/mimetypes/mobile_notes.desktop,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
-diff -u -r1.36.2.4 -r1.36.2.5
+diff -u -d -r1.36.2.4 -r1.36.2.5
--- kmobile/kioslave/mimetypes/mobile_notes.desktop 13 Nov 2004 07:20:52 -0000 1.36.2.4
+++ kmobile/kioslave/mimetypes/mobile_notes.desktop 29 Dec 2004 21:45:01 -0000 1.36.2.5
@@ -1,6 +1,7 @@
@@ -4782,7 +4847,7 @@
RCS file: /home/kde/kdepim/knode/KNode.desktop,v
retrieving revision 1.178.2.3
retrieving revision 1.178.2.6
-diff -u -r1.178.2.3 -r1.178.2.6
+diff -u -d -r1.178.2.3 -r1.178.2.6
--- knode/KNode.desktop 10 Nov 2004 07:37:28 -0000 1.178.2.3
+++ knode/KNode.desktop 26 Jan 2005 08:10:29 -0000 1.178.2.6
@@ -9,7 +9,6 @@
@@ -4822,7 +4887,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_accounts.desktop,v
retrieving revision 1.25.2.10
retrieving revision 1.25.2.13
-diff -u -r1.25.2.10 -r1.25.2.13
+diff -u -d -r1.25.2.10 -r1.25.2.13
--- knode/knode_config_accounts.desktop 13 Nov 2004 07:20:52 -0000 1.25.2.10
+++ knode/knode_config_accounts.desktop 26 Jan 2005 08:10:29 -0000 1.25.2.13
@@ -13,6 +13,7 @@
@@ -4870,7 +4935,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_appearance.desktop,v
retrieving revision 1.22.2.11
retrieving revision 1.22.2.14
-diff -u -r1.22.2.11 -r1.22.2.14
+diff -u -d -r1.22.2.11 -r1.22.2.14
--- knode/knode_config_appearance.desktop 26 Nov 2004 08:05:19 -0000 1.22.2.11
+++ knode/knode_config_appearance.desktop 9 Jan 2005 07:49:22 -0000 1.22.2.14
@@ -13,6 +13,7 @@
@@ -4910,7 +4975,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_cleanup.desktop,v
retrieving revision 1.22.2.8
retrieving revision 1.22.2.11
-diff -u -r1.22.2.8 -r1.22.2.11
+diff -u -d -r1.22.2.8 -r1.22.2.11
--- knode/knode_config_cleanup.desktop 13 Nov 2004 07:20:52 -0000 1.22.2.8
+++ knode/knode_config_cleanup.desktop 9 Jan 2005 07:49:22 -0000 1.22.2.11
@@ -13,6 +13,7 @@
@@ -4946,7 +5011,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_identity.desktop,v
retrieving revision 1.24.2.11
retrieving revision 1.24.2.14
-diff -u -r1.24.2.11 -r1.24.2.14
+diff -u -d -r1.24.2.11 -r1.24.2.14
--- knode/knode_config_identity.desktop 19 Nov 2004 07:37:43 -0000 1.24.2.11
+++ knode/knode_config_identity.desktop 26 Jan 2005 08:10:29 -0000 1.24.2.14
@@ -13,6 +13,7 @@
@@ -4994,7 +5059,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_post_news.desktop,v
retrieving revision 1.21.2.8
retrieving revision 1.21.2.9
-diff -u -r1.21.2.8 -r1.21.2.9
+diff -u -d -r1.21.2.8 -r1.21.2.9
--- knode/knode_config_post_news.desktop 13 Nov 2004 07:20:52 -0000 1.21.2.8
+++ knode/knode_config_post_news.desktop 29 Dec 2004 21:45:02 -0000 1.21.2.9
@@ -13,6 +13,7 @@
@@ -5010,7 +5075,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_privacy.desktop,v
retrieving revision 1.22.2.8
retrieving revision 1.22.2.9
-diff -u -r1.22.2.8 -r1.22.2.9
+diff -u -d -r1.22.2.8 -r1.22.2.9
--- knode/knode_config_privacy.desktop 13 Nov 2004 07:20:52 -0000 1.22.2.8
+++ knode/knode_config_privacy.desktop 29 Dec 2004 21:45:02 -0000 1.22.2.9
@@ -13,6 +13,7 @@
@@ -5034,7 +5099,7 @@
RCS file: /home/kde/kdepim/knode/knode_config_read_news.desktop,v
retrieving revision 1.22.2.7
retrieving revision 1.22.2.8
-diff -u -r1.22.2.7 -r1.22.2.8
+diff -u -d -r1.22.2.7 -r1.22.2.8
--- knode/knode_config_read_news.desktop 13 Nov 2004 07:20:52 -0000 1.22.2.7
+++ knode/knode_config_read_news.desktop 29 Dec 2004 21:45:02 -0000 1.22.2.8
@@ -13,6 +13,7 @@
@@ -5050,7 +5115,7 @@
RCS file: /home/kde/kdepim/knotes/knotes.desktop,v
retrieving revision 1.283.2.1
retrieving revision 1.283.2.2
-diff -u -r1.283.2.1 -r1.283.2.2
+diff -u -d -r1.283.2.1 -r1.283.2.2
--- knotes/knotes.desktop 24 Aug 2004 06:32:21 -0000 1.283.2.1
+++ knotes/knotes.desktop 12 Dec 2004 08:32:48 -0000 1.283.2.2
@@ -33,6 +33,7 @@
@@ -5074,7 +5139,7 @@
RCS file: /home/kde/kdepim/knotes/local.desktop,v
retrieving revision 1.22.2.7
retrieving revision 1.22.2.8
-diff -u -r1.22.2.7 -r1.22.2.8
+diff -u -d -r1.22.2.7 -r1.22.2.8
--- knotes/local.desktop 13 Nov 2004 07:20:53 -0000 1.22.2.7
+++ knotes/local.desktop 29 Dec 2004 21:45:02 -0000 1.22.2.8
@@ -3,6 +3,7 @@
@@ -5090,7 +5155,7 @@
RCS file: /home/kde/kdepim/kontact/interfaces/kontactplugin.desktop,v
retrieving revision 1.80.2.3
retrieving revision 1.80.2.6
-diff -u -r1.80.2.3 -r1.80.2.6
+diff -u -d -r1.80.2.3 -r1.80.2.6
--- kontact/interfaces/kontactplugin.desktop 28 Nov 2004 08:34:00 -0000 1.80.2.3
+++ kontact/interfaces/kontactplugin.desktop 15 Feb 2005 10:16:44 -0000 1.80.2.6
@@ -2,6 +2,7 @@
@@ -5122,7 +5187,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/kaddressbook/kaddressbookplugin.desktop,v
retrieving revision 1.46.2.4
retrieving revision 1.46.2.7
-diff -u -r1.46.2.4 -r1.46.2.7
+diff -u -d -r1.46.2.4 -r1.46.2.7
--- kontact/plugins/kaddressbook/kaddressbookplugin.desktop 28 Nov 2004 08:34:00 -0000 1.46.2.4
+++ kontact/plugins/kaddressbook/kaddressbookplugin.desktop 26 Jan 2005 08:10:30 -0000 1.46.2.7
@@ -17,8 +17,10 @@
@@ -5175,7 +5240,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/kaddressbook/kcmkabsummary.desktop,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.10
-diff -u -r1.27.2.7 -r1.27.2.10
+diff -u -d -r1.27.2.7 -r1.27.2.10
--- kontact/plugins/kaddressbook/kcmkabsummary.desktop 13 Nov 2004 07:20:53 -0000 1.27.2.7
+++ kontact/plugins/kaddressbook/kcmkabsummary.desktop 26 Jan 2005 08:10:30 -0000 1.27.2.10
@@ -12,6 +12,7 @@
@@ -5231,7 +5296,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/kitchensync/kitchensync.desktop,v
retrieving revision 1.54.2.4
retrieving revision 1.54.2.7
-diff -u -r1.54.2.4 -r1.54.2.7
+diff -u -d -r1.54.2.4 -r1.54.2.7
--- kontact/plugins/kitchensync/kitchensync.desktop 28 Nov 2004 08:34:00 -0000 1.54.2.4
+++ kontact/plugins/kitchensync/kitchensync.desktop 26 Jan 2005 08:10:30 -0000 1.54.2.7
@@ -14,7 +14,9 @@
@@ -5273,7 +5338,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/kmail/kcmkmailsummary.desktop,v
retrieving revision 1.26.2.8
retrieving revision 1.26.2.10
-diff -u -r1.26.2.8 -r1.26.2.10
+diff -u -d -r1.26.2.8 -r1.26.2.10
--- kontact/plugins/kmail/kcmkmailsummary.desktop 13 Nov 2004 07:20:53 -0000 1.26.2.8
+++ kontact/plugins/kmail/kcmkmailsummary.desktop 9 Jan 2005 07:49:23 -0000 1.26.2.10
@@ -12,6 +12,7 @@
@@ -5321,7 +5386,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/kmail/kmailplugin.desktop,v
retrieving revision 1.62.2.5
retrieving revision 1.62.2.8
-diff -u -r1.62.2.5 -r1.62.2.8
+diff -u -d -r1.62.2.5 -r1.62.2.8
--- kontact/plugins/kmail/kmailplugin.desktop 28 Nov 2004 08:34:01 -0000 1.62.2.5
+++ kontact/plugins/kmail/kmailplugin.desktop 26 Jan 2005 08:10:30 -0000 1.62.2.8
@@ -18,8 +18,10 @@
@@ -5372,7 +5437,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/knode/knodeplugin.desktop,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.8
-diff -u -r1.48.2.5 -r1.48.2.8
+diff -u -d -r1.48.2.5 -r1.48.2.8
--- kontact/plugins/knode/knodeplugin.desktop 28 Nov 2004 08:34:01 -0000 1.48.2.5
+++ kontact/plugins/knode/knodeplugin.desktop 26 Jan 2005 08:10:31 -0000 1.48.2.8
@@ -15,8 +15,10 @@
@@ -5423,7 +5488,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/knotes/knotesplugin.desktop,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.7
-diff -u -r1.41.2.4 -r1.41.2.7
+diff -u -d -r1.41.2.4 -r1.41.2.7
--- kontact/plugins/knotes/knotesplugin.desktop 28 Nov 2004 08:34:01 -0000 1.41.2.4
+++ kontact/plugins/knotes/knotesplugin.desktop 26 Jan 2005 08:10:31 -0000 1.41.2.7
@@ -15,8 +15,10 @@
@@ -5474,7 +5539,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/korganizer/kcmkorgsummary.desktop,v
retrieving revision 1.25.2.10
retrieving revision 1.25.2.13
-diff -u -r1.25.2.10 -r1.25.2.13
+diff -u -d -r1.25.2.10 -r1.25.2.13
--- kontact/plugins/korganizer/kcmkorgsummary.desktop 13 Nov 2004 07:20:54 -0000 1.25.2.10
+++ kontact/plugins/korganizer/kcmkorgsummary.desktop 26 Jan 2005 08:10:31 -0000 1.25.2.13
@@ -12,6 +12,7 @@
@@ -5530,7 +5595,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/korganizer/korganizerplugin.desktop,v
retrieving revision 1.49.2.5
retrieving revision 1.49.2.8
-diff -u -r1.49.2.5 -r1.49.2.8
+diff -u -d -r1.49.2.5 -r1.49.2.8
--- kontact/plugins/korganizer/korganizerplugin.desktop 28 Nov 2004 08:34:01 -0000 1.49.2.5
+++ kontact/plugins/korganizer/korganizerplugin.desktop 26 Jan 2005 08:10:31 -0000 1.49.2.8
@@ -17,8 +17,10 @@
@@ -5581,7 +5646,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/korganizer/todoplugin.desktop,v
retrieving revision 1.58.2.7
retrieving revision 1.58.2.10
-diff -u -r1.58.2.7 -r1.58.2.10
+diff -u -d -r1.58.2.7 -r1.58.2.10
--- kontact/plugins/korganizer/todoplugin.desktop 28 Nov 2004 08:34:01 -0000 1.58.2.7
+++ kontact/plugins/korganizer/todoplugin.desktop 9 Jan 2005 07:49:24 -0000 1.58.2.10
@@ -17,6 +17,7 @@
@@ -5617,7 +5682,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/kpilot/kpilotplugin.desktop,v
retrieving revision 1.30.2.11
retrieving revision 1.30.2.13
-diff -u -r1.30.2.11 -r1.30.2.13
+diff -u -d -r1.30.2.11 -r1.30.2.13
--- kontact/plugins/kpilot/kpilotplugin.desktop 28 Nov 2004 08:34:02 -0000 1.30.2.11
+++ kontact/plugins/kpilot/kpilotplugin.desktop 9 Jan 2005 07:49:24 -0000 1.30.2.13
@@ -16,8 +16,10 @@
@@ -5660,7 +5725,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/newsticker/kcmkontactknt.desktop,v
retrieving revision 1.49.2.10
retrieving revision 1.49.2.13
-diff -u -r1.49.2.10 -r1.49.2.13
+diff -u -d -r1.49.2.10 -r1.49.2.13
--- kontact/plugins/newsticker/kcmkontactknt.desktop 13 Nov 2004 07:20:54 -0000 1.49.2.10
+++ kontact/plugins/newsticker/kcmkontactknt.desktop 26 Jan 2005 08:10:31 -0000 1.49.2.13
@@ -12,6 +12,7 @@
@@ -5716,7 +5781,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/newsticker/newstickerplugin.desktop,v
retrieving revision 1.50.2.11
retrieving revision 1.50.2.12
-diff -u -r1.50.2.11 -r1.50.2.12
+diff -u -d -r1.50.2.11 -r1.50.2.12
--- kontact/plugins/newsticker/newstickerplugin.desktop 28 Nov 2004 08:34:02 -0000 1.50.2.11
+++ kontact/plugins/newsticker/newstickerplugin.desktop 29 Dec 2004 21:45:05 -0000 1.50.2.12
@@ -15,6 +15,7 @@
@@ -5740,7 +5805,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/summary/kcmkontactsummary.desktop,v
retrieving revision 1.42.2.10
retrieving revision 1.42.2.13
-diff -u -r1.42.2.10 -r1.42.2.13
+diff -u -d -r1.42.2.10 -r1.42.2.13
--- kontact/plugins/summary/kcmkontactsummary.desktop 13 Nov 2004 07:20:54 -0000 1.42.2.10
+++ kontact/plugins/summary/kcmkontactsummary.desktop 26 Jan 2005 08:10:32 -0000 1.42.2.13
@@ -12,6 +12,7 @@
@@ -5780,7 +5845,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/summary/summaryplugin.desktop,v
retrieving revision 1.43.2.5
retrieving revision 1.43.2.8
-diff -u -r1.43.2.5 -r1.43.2.8
+diff -u -d -r1.43.2.5 -r1.43.2.8
--- kontact/plugins/summary/summaryplugin.desktop 28 Nov 2004 08:34:02 -0000 1.43.2.5
+++ kontact/plugins/summary/summaryplugin.desktop 26 Jan 2005 08:10:32 -0000 1.43.2.8
@@ -13,6 +13,7 @@
@@ -5828,7 +5893,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/test/kptestplugin.desktop,v
retrieving revision 1.82.2.5
retrieving revision 1.82.2.8
-diff -u -r1.82.2.5 -r1.82.2.8
+diff -u -d -r1.82.2.5 -r1.82.2.8
--- kontact/plugins/test/kptestplugin.desktop 28 Nov 2004 08:34:02 -0000 1.82.2.5
+++ kontact/plugins/test/kptestplugin.desktop 9 Jan 2005 07:49:25 -0000 1.82.2.8
@@ -12,6 +12,7 @@
@@ -5876,7 +5941,7 @@
RCS file: /home/kde/kdepim/kontact/plugins/weather/weatherplugin.desktop,v
retrieving revision 1.44.2.7
retrieving revision 1.44.2.9
-diff -u -r1.44.2.7 -r1.44.2.9
+diff -u -d -r1.44.2.7 -r1.44.2.9
--- kontact/plugins/weather/weatherplugin.desktop 28 Nov 2004 08:34:03 -0000 1.44.2.7
+++ kontact/plugins/weather/weatherplugin.desktop 9 Jan 2005 07:49:25 -0000 1.44.2.9
@@ -16,6 +16,7 @@
@@ -5916,7 +5981,7 @@
RCS file: /home/kde/kdepim/kontact/src/Kontact.desktop,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.5
-diff -u -r1.39.2.2 -r1.39.2.5
+diff -u -d -r1.39.2.2 -r1.39.2.5
--- kontact/src/Kontact.desktop 31 Aug 2004 07:23:21 -0000 1.39.2.2
+++ kontact/src/Kontact.desktop 9 Jan 2005 07:49:25 -0000 1.39.2.5
@@ -9,6 +9,7 @@
@@ -5948,7 +6013,7 @@
RCS file: /home/kde/kdepim/kontact/src/kontact.setdlg,v
retrieving revision 1.61.2.5
retrieving revision 1.61.2.10
-diff -u -r1.61.2.5 -r1.61.2.10
+diff -u -d -r1.61.2.5 -r1.61.2.10
--- kontact/src/kontact.setdlg 24 Oct 2004 07:06:02 -0000 1.61.2.5
+++ kontact/src/kontact.setdlg 23 Feb 2005 09:00:25 -0000 1.61.2.10
@@ -1,5 +1,6 @@
@@ -6102,7 +6167,7 @@
RCS file: /home/kde/kdepim/kontact/src/mainwindow.cpp,v
retrieving revision 1.124.2.2
retrieving revision 1.124.2.4
-diff -u -r1.124.2.2 -r1.124.2.4
+diff -u -d -r1.124.2.2 -r1.124.2.4
--- kontact/src/mainwindow.cpp 17 Nov 2004 12:54:07 -0000 1.124.2.2
+++ kontact/src/mainwindow.cpp 18 Jan 2005 11:21:53 -0000 1.124.2.4
@@ -32,6 +32,7 @@
@@ -6140,7 +6205,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configcolors.desktop,v
retrieving revision 1.49.2.4
retrieving revision 1.49.2.7
-diff -u -r1.49.2.4 -r1.49.2.7
+diff -u -d -r1.49.2.4 -r1.49.2.7
--- korganizer/configcolors.desktop 26 Nov 2004 08:05:19 -0000 1.49.2.4
+++ korganizer/configcolors.desktop 9 Jan 2005 07:49:26 -0000 1.49.2.7
@@ -43,7 +43,6 @@
@@ -6180,7 +6245,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configfonts.desktop,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.6
-diff -u -r1.48.2.4 -r1.48.2.6
+diff -u -d -r1.48.2.4 -r1.48.2.6
--- korganizer/configfonts.desktop 26 Nov 2004 08:05:20 -0000 1.48.2.4
+++ korganizer/configfonts.desktop 9 Jan 2005 07:49:26 -0000 1.48.2.6
@@ -41,7 +41,6 @@
@@ -6212,7 +6277,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configfreebusy.desktop,v
retrieving revision 1.38.2.5
retrieving revision 1.38.2.6
-diff -u -r1.38.2.5 -r1.38.2.6
+diff -u -d -r1.38.2.5 -r1.38.2.6
--- korganizer/configfreebusy.desktop 24 Oct 2004 07:06:03 -0000 1.38.2.5
+++ korganizer/configfreebusy.desktop 29 Dec 2004 21:45:06 -0000 1.38.2.6
@@ -51,6 +51,7 @@
@@ -6236,7 +6301,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configgroupautomation.desktop,v
retrieving revision 1.44.2.2
retrieving revision 1.44.2.4
-diff -u -r1.44.2.2 -r1.44.2.4
+diff -u -d -r1.44.2.2 -r1.44.2.4
--- korganizer/configgroupautomation.desktop 24 Oct 2004 07:06:03 -0000 1.44.2.2
+++ korganizer/configgroupautomation.desktop 9 Jan 2005 07:49:26 -0000 1.44.2.4
@@ -39,6 +39,7 @@
@@ -6276,7 +6341,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configgroupscheduling.desktop,v
retrieving revision 1.47.2.4
retrieving revision 1.47.2.6
-diff -u -r1.47.2.4 -r1.47.2.6
+diff -u -d -r1.47.2.4 -r1.47.2.6
--- korganizer/configgroupscheduling.desktop 24 Oct 2004 07:06:03 -0000 1.47.2.4
+++ korganizer/configgroupscheduling.desktop 9 Jan 2005 07:49:26 -0000 1.47.2.6
@@ -40,6 +40,7 @@
@@ -6308,7 +6373,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configmain.desktop,v
retrieving revision 1.49.2.5
retrieving revision 1.49.2.7
-diff -u -r1.49.2.5 -r1.49.2.7
+diff -u -d -r1.49.2.5 -r1.49.2.7
--- korganizer/configmain.desktop 26 Nov 2004 08:05:20 -0000 1.49.2.5
+++ korganizer/configmain.desktop 9 Jan 2005 07:49:26 -0000 1.49.2.7
@@ -40,6 +40,7 @@
@@ -6348,7 +6413,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configprinting.desktop,v
retrieving revision 1.47.2.3
retrieving revision 1.47.2.6
-diff -u -r1.47.2.3 -r1.47.2.6
+diff -u -d -r1.47.2.3 -r1.47.2.6
--- korganizer/configprinting.desktop 29 Sep 2004 14:06:36 -0000 1.47.2.3
+++ korganizer/configprinting.desktop 23 Feb 2005 09:00:26 -0000 1.47.2.6
@@ -13,6 +13,7 @@
@@ -6396,7 +6461,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configtime.desktop,v
retrieving revision 1.47.2.4
retrieving revision 1.47.2.6
-diff -u -r1.47.2.4 -r1.47.2.6
+diff -u -d -r1.47.2.4 -r1.47.2.6
--- korganizer/configtime.desktop 24 Oct 2004 07:06:03 -0000 1.47.2.4
+++ korganizer/configtime.desktop 9 Jan 2005 07:49:26 -0000 1.47.2.6
@@ -43,6 +43,7 @@
@@ -6420,7 +6485,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/configviews.desktop,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.6
-diff -u -r1.46.2.3 -r1.46.2.6
+diff -u -d -r1.46.2.3 -r1.46.2.6
--- korganizer/configviews.desktop 24 Oct 2004 07:06:03 -0000 1.46.2.3
+++ korganizer/configviews.desktop 13 Jan 2005 08:02:45 -0000 1.46.2.6
@@ -16,6 +16,7 @@
@@ -6460,7 +6525,7 @@
RCS file: /home/kde/kdepim/korganizer/dcopcalendar.desktop,v
retrieving revision 1.41.2.2
retrieving revision 1.41.2.3
-diff -u -r1.41.2.2 -r1.41.2.3
+diff -u -d -r1.41.2.2 -r1.41.2.3
--- korganizer/dcopcalendar.desktop 24 Oct 2004 07:06:03 -0000 1.41.2.2
+++ korganizer/dcopcalendar.desktop 29 Dec 2004 21:45:06 -0000 1.41.2.3
@@ -3,6 +3,7 @@
@@ -6476,7 +6541,7 @@
RCS file: /home/kde/kdepim/korganizer/koeditordetails.cpp,v
retrieving revision 1.70.2.10
retrieving revision 1.70.2.11
-diff -u -r1.70.2.10 -r1.70.2.11
+diff -u -d -r1.70.2.10 -r1.70.2.11
--- korganizer/koeditordetails.cpp 2 Nov 2004 13:48:17 -0000 1.70.2.10
+++ korganizer/koeditordetails.cpp 28 Dec 2004 20:59:25 -0000 1.70.2.11
@@ -67,13 +67,13 @@
@@ -6500,7 +6565,7 @@
RCS file: /home/kde/kdepim/korganizer/koeditordetails.h,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
-diff -u -r1.34.2.1 -r1.34.2.2
+diff -u -d -r1.34.2.1 -r1.34.2.2
--- korganizer/koeditordetails.h 13 Oct 2004 12:35:44 -0000 1.34.2.1
+++ korganizer/koeditordetails.h 28 Dec 2004 20:59:25 -0000 1.34.2.2
@@ -45,7 +45,7 @@
@@ -6517,7 +6582,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer.desktop,v
retrieving revision 1.237.2.5
retrieving revision 1.237.2.8
-diff -u -r1.237.2.5 -r1.237.2.8
+diff -u -d -r1.237.2.5 -r1.237.2.8
--- korganizer/korganizer.desktop 10 Nov 2004 07:37:28 -0000 1.237.2.5
+++ korganizer/korganizer.desktop 9 Jan 2005 07:49:26 -0000 1.237.2.8
@@ -29,6 +29,7 @@
@@ -6556,7 +6621,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configcolors.desktop,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.7
-diff -u -r1.16.2.4 -r1.16.2.7
+diff -u -d -r1.16.2.4 -r1.16.2.7
--- korganizer/korganizer_configcolors.desktop 26 Nov 2004 08:05:20 -0000 1.16.2.4
+++ korganizer/korganizer_configcolors.desktop 9 Jan 2005 07:49:26 -0000 1.16.2.7
@@ -43,7 +43,6 @@
@@ -6596,7 +6661,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configfonts.desktop,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.6
-diff -u -r1.16.2.4 -r1.16.2.6
+diff -u -d -r1.16.2.4 -r1.16.2.6
--- korganizer/korganizer_configfonts.desktop 26 Nov 2004 08:05:20 -0000 1.16.2.4
+++ korganizer/korganizer_configfonts.desktop 9 Jan 2005 07:49:26 -0000 1.16.2.6
@@ -41,7 +41,6 @@
@@ -6628,7 +6693,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configfreebusy.desktop,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
-diff -u -r1.14.2.5 -r1.14.2.6
+diff -u -d -r1.14.2.5 -r1.14.2.6
--- korganizer/korganizer_configfreebusy.desktop 24 Oct 2004 07:06:03 -0000 1.14.2.5
+++ korganizer/korganizer_configfreebusy.desktop 29 Dec 2004 21:45:06 -0000 1.14.2.6
@@ -51,6 +51,7 @@
@@ -6652,7 +6717,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configgroupautomation.desktop,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.4
-diff -u -r1.16.2.2 -r1.16.2.4
+diff -u -d -r1.16.2.2 -r1.16.2.4
--- korganizer/korganizer_configgroupautomation.desktop 24 Oct 2004 07:06:03 -0000 1.16.2.2
+++ korganizer/korganizer_configgroupautomation.desktop 9 Jan 2005 07:49:26 -0000 1.16.2.4
@@ -39,6 +39,7 @@
@@ -6692,7 +6757,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configgroupscheduling.desktop,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.6
-diff -u -r1.17.2.4 -r1.17.2.6
+diff -u -d -r1.17.2.4 -r1.17.2.6
--- korganizer/korganizer_configgroupscheduling.desktop 24 Oct 2004 07:06:03 -0000 1.17.2.4
+++ korganizer/korganizer_configgroupscheduling.desktop 9 Jan 2005 07:49:26 -0000 1.17.2.6
@@ -40,6 +40,7 @@
@@ -6724,7 +6789,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configmain.desktop,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.7
-diff -u -r1.17.2.5 -r1.17.2.7
+diff -u -d -r1.17.2.5 -r1.17.2.7
--- korganizer/korganizer_configmain.desktop 26 Nov 2004 08:05:20 -0000 1.17.2.5
+++ korganizer/korganizer_configmain.desktop 9 Jan 2005 07:49:26 -0000 1.17.2.7
@@ -40,6 +40,7 @@
@@ -6764,7 +6829,7 @@
RCS file: /home/kde/kdepim/korganizer/Attic/korganizer_configprinting.desktop,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.6
-diff -u -r1.15.2.3 -r1.15.2.6
+diff -u -d -r1.15.2.3 -r1.15.2.6
--- korganizer/korganizer_configprinting.desktop 29 Sep 2004 14:06:37 -0000 1.15.2.3
+++ korganizer/korganizer_configprinting.desktop 23 Feb 2005 09:00:26 -0000 1.15.2.6
@@ -13,6 +13,7 @@
@@ -6812,7 +6877,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configtime.desktop,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.6
-diff -u -r1.16.2.4 -r1.16.2.6
+diff -u -d -r1.16.2.4 -r1.16.2.6
--- korganizer/korganizer_configtime.desktop 24 Oct 2004 07:06:03 -0000 1.16.2.4
+++ korganizer/korganizer_configtime.desktop 9 Jan 2005 07:49:26 -0000 1.16.2.6
@@ -43,6 +43,7 @@
@@ -6836,7 +6901,7 @@
RCS file: /home/kde/kdepim/korganizer/korganizer_configviews.desktop,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.6
-diff -u -r1.16.2.3 -r1.16.2.6
+diff -u -d -r1.16.2.3 -r1.16.2.6
--- korganizer/korganizer_configviews.desktop 24 Oct 2004 07:06:03 -0000 1.16.2.3
+++ korganizer/korganizer_configviews.desktop 13 Jan 2005 08:02:46 -0000 1.16.2.6
@@ -16,6 +16,7 @@
@@ -6876,7 +6941,7 @@
RCS file: /home/kde/kdepim/korganizer/urihandler.cpp,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
-diff -u -r1.8.2.1 -r1.8.2.2
+diff -u -d -r1.8.2.1 -r1.8.2.2
--- korganizer/urihandler.cpp 20 Oct 2004 14:54:56 -0000 1.8.2.1
+++ korganizer/urihandler.cpp 8 Jan 2005 01:33:21 -0000 1.8.2.2
@@ -41,6 +41,8 @@
@@ -6893,7 +6958,7 @@
RCS file: /home/kde/kdepim/korganizer/interfaces/calendar/calendardecoration.desktop,v
retrieving revision 1.60.2.5
retrieving revision 1.60.2.8
-diff -u -r1.60.2.5 -r1.60.2.8
+diff -u -d -r1.60.2.5 -r1.60.2.8
--- korganizer/interfaces/calendar/calendardecoration.desktop 28 Nov 2004 08:34:03 -0000 1.60.2.5
+++ korganizer/interfaces/calendar/calendardecoration.desktop 9 Jan 2005 07:49:26 -0000 1.60.2.8
@@ -6,6 +6,7 @@
@@ -6925,7 +6990,7 @@
RCS file: /home/kde/kdepim/korganizer/interfaces/calendar/calendarplugin.desktop,v
retrieving revision 1.87.2.6
retrieving revision 1.87.2.8
-diff -u -r1.87.2.6 -r1.87.2.8
+diff -u -d -r1.87.2.6 -r1.87.2.8
--- korganizer/interfaces/calendar/calendarplugin.desktop 28 Nov 2004 08:34:03 -0000 1.87.2.6
+++ korganizer/interfaces/calendar/calendarplugin.desktop 9 Jan 2005 07:49:26 -0000 1.87.2.8
@@ -33,6 +33,7 @@
@@ -6949,7 +7014,7 @@
RCS file: /home/kde/kdepim/korganizer/interfaces/korganizer/korganizerpart.desktop,v
retrieving revision 1.68.2.1
retrieving revision 1.68.2.3
-diff -u -r1.68.2.1 -r1.68.2.3
+diff -u -d -r1.68.2.1 -r1.68.2.3
--- korganizer/interfaces/korganizer/korganizerpart.desktop 24 Aug 2004 06:32:34 -0000 1.68.2.1
+++ korganizer/interfaces/korganizer/korganizerpart.desktop 9 Jan 2005 07:49:27 -0000 1.68.2.3
@@ -25,6 +25,7 @@
@@ -6973,7 +7038,7 @@
RCS file: /home/kde/kdepim/korganizer/korgac/korgac.desktop,v
retrieving revision 1.85.2.8
retrieving revision 1.85.2.10
-diff -u -r1.85.2.8 -r1.85.2.10
+diff -u -d -r1.85.2.8 -r1.85.2.10
--- korganizer/korgac/korgac.desktop 13 Nov 2004 07:20:55 -0000 1.85.2.8
+++ korganizer/korgac/korgac.desktop 5 Jan 2005 07:50:31 -0000 1.85.2.10
@@ -28,6 +28,7 @@
@@ -6997,7 +7062,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/datenums/datenums.desktop,v
retrieving revision 1.101.2.10
retrieving revision 1.101.2.11
-diff -u -r1.101.2.10 -r1.101.2.11
+diff -u -d -r1.101.2.10 -r1.101.2.11
--- korganizer/plugins/datenums/datenums.desktop 28 Nov 2004 08:34:03 -0000 1.101.2.10
+++ korganizer/plugins/datenums/datenums.desktop 5 Jan 2005 07:50:31 -0000 1.101.2.11
@@ -2,6 +2,7 @@
@@ -7013,7 +7078,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/exchange/exchange.desktop,v
retrieving revision 1.78.2.11
retrieving revision 1.78.2.12
-diff -u -r1.78.2.11 -r1.78.2.12
+diff -u -d -r1.78.2.11 -r1.78.2.12
--- korganizer/plugins/exchange/exchange.desktop 28 Nov 2004 08:34:04 -0000 1.78.2.11
+++ korganizer/plugins/exchange/exchange.desktop 5 Jan 2005 07:50:31 -0000 1.78.2.12
@@ -2,6 +2,7 @@
@@ -7029,7 +7094,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/hebrew/hebrew.desktop,v
retrieving revision 1.61.2.12
retrieving revision 1.61.2.14
-diff -u -r1.61.2.12 -r1.61.2.14
+diff -u -d -r1.61.2.12 -r1.61.2.14
--- korganizer/plugins/hebrew/hebrew.desktop 28 Nov 2004 08:34:04 -0000 1.61.2.12
+++ korganizer/plugins/hebrew/hebrew.desktop 5 Jan 2005 07:50:32 -0000 1.61.2.14
@@ -2,7 +2,9 @@
@@ -7047,7 +7112,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/holidays/Attic/holidays.desktop,v
retrieving revision 1.101.2.12
retrieving revision 1.101.2.13
-diff -u -r1.101.2.12 -r1.101.2.13
+diff -u -d -r1.101.2.12 -r1.101.2.13
--- korganizer/plugins/holidays/holidays.desktop 28 Nov 2004 08:34:04 -0000 1.101.2.12
+++ korganizer/plugins/holidays/holidays.desktop 5 Jan 2005 07:50:32 -0000 1.101.2.13
@@ -2,6 +2,7 @@
@@ -7063,7 +7128,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/holidays/holidays/Attic/holiday_ro,v
retrieving revision 1.3
retrieving revision 1.3.2.1
-diff -u -r1.3 -r1.3.2.1
+diff -u -d -r1.3 -r1.3.2.1
--- korganizer/plugins/holidays/holidays/holiday_ro 23 Jul 2004 16:32:45 -0000 1.3
+++ korganizer/plugins/holidays/holidays/holiday_ro 26 Dec 2004 22:26:39 -0000 1.3.2.1
@@ -3,11 +3,11 @@
@@ -7086,7 +7151,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/projectview/projectview.desktop,v
retrieving revision 1.85.2.5
retrieving revision 1.85.2.6
-diff -u -r1.85.2.5 -r1.85.2.6
+diff -u -d -r1.85.2.5 -r1.85.2.6
--- korganizer/plugins/projectview/projectview.desktop 28 Nov 2004 08:34:04 -0000 1.85.2.5
+++ korganizer/plugins/projectview/projectview.desktop 12 Dec 2004 08:32:50 -0000 1.85.2.6
@@ -29,6 +29,7 @@
@@ -7102,7 +7167,7 @@
RCS file: /home/kde/kdepim/korganizer/plugins/webexport/Attic/webexport.desktop,v
retrieving revision 1.100.2.10
retrieving revision 1.100.2.11
-diff -u -r1.100.2.10 -r1.100.2.11
+diff -u -d -r1.100.2.10 -r1.100.2.11
--- korganizer/plugins/webexport/webexport.desktop 28 Nov 2004 08:34:05 -0000 1.100.2.10
+++ korganizer/plugins/webexport/webexport.desktop 5 Jan 2005 07:50:32 -0000 1.100.2.11
@@ -2,6 +2,7 @@
@@ -7118,7 +7183,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop,v
retrieving revision 1.152.2.2
retrieving revision 1.152.2.6
-diff -u -r1.152.2.2 -r1.152.2.6
+diff -u -d -r1.152.2.2 -r1.152.2.6
--- kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop 24 Oct 2004 07:06:06 -0000 1.152.2.2
+++ kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop 26 Jan 2005 08:10:32 -0000 1.152.2.6
@@ -2,6 +2,7 @@
@@ -7158,7 +7223,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/docconduit/doc_conduit.desktop,v
retrieving revision 1.51.2.3
retrieving revision 1.51.2.4
-diff -u -r1.51.2.3 -r1.51.2.4
+diff -u -d -r1.51.2.3 -r1.51.2.4
--- kpilot/conduits/docconduit/doc_conduit.desktop 24 Oct 2004 07:06:06 -0000 1.51.2.3
+++ kpilot/conduits/docconduit/doc_conduit.desktop 29 Dec 2004 21:45:08 -0000 1.51.2.4
@@ -2,6 +2,7 @@
@@ -7174,7 +7239,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/docconduit/kpalmdoc.desktop,v
retrieving revision 1.56.2.2
retrieving revision 1.56.2.3
-diff -u -r1.56.2.2 -r1.56.2.3
+diff -u -d -r1.56.2.2 -r1.56.2.3
--- kpilot/conduits/docconduit/kpalmdoc.desktop 24 Oct 2004 07:06:06 -0000 1.56.2.2
+++ kpilot/conduits/docconduit/kpalmdoc.desktop 29 Dec 2004 21:45:08 -0000 1.56.2.3
@@ -6,6 +6,7 @@
@@ -7190,7 +7255,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/knotes/knotes-conduit.desktop,v
retrieving revision 1.123.2.3
retrieving revision 1.123.2.5
-diff -u -r1.123.2.3 -r1.123.2.5
+diff -u -d -r1.123.2.3 -r1.123.2.5
--- kpilot/conduits/knotes/knotes-conduit.desktop 19 Nov 2004 07:37:43 -0000 1.123.2.3
+++ kpilot/conduits/knotes/knotes-conduit.desktop 17 Jan 2005 08:24:17 -0000 1.123.2.5
@@ -2,6 +2,7 @@
@@ -7223,7 +7288,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/malconduit/mal_conduit.desktop,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.3
-diff -u -r1.36.2.1 -r1.36.2.3
+diff -u -d -r1.36.2.1 -r1.36.2.3
--- kpilot/conduits/malconduit/mal_conduit.desktop 24 Aug 2004 06:32:42 -0000 1.36.2.1
+++ kpilot/conduits/malconduit/mal_conduit.desktop 29 Dec 2004 21:45:08 -0000 1.36.2.3
@@ -2,6 +2,7 @@
@@ -7247,7 +7312,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/notepadconduit/notepad-conduit.desktop,v
retrieving revision 1.20.2.9
retrieving revision 1.20.2.10
-diff -u -r1.20.2.9 -r1.20.2.10
+diff -u -d -r1.20.2.9 -r1.20.2.10
--- kpilot/conduits/notepadconduit/notepad-conduit.desktop 13 Nov 2004 07:20:56 -0000 1.20.2.9
+++ kpilot/conduits/notepadconduit/notepad-conduit.desktop 29 Dec 2004 21:45:09 -0000 1.20.2.10
@@ -2,6 +2,7 @@
@@ -7271,7 +7336,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/null/null-conduit.desktop,v
retrieving revision 1.148.2.2
retrieving revision 1.148.2.3
-diff -u -r1.148.2.2 -r1.148.2.3
+diff -u -d -r1.148.2.2 -r1.148.2.3
--- kpilot/conduits/null/null-conduit.desktop 19 Nov 2004 07:37:43 -0000 1.148.2.2
+++ kpilot/conduits/null/null-conduit.desktop 29 Dec 2004 21:45:09 -0000 1.148.2.3
@@ -8,6 +8,7 @@
@@ -7287,7 +7352,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/perlconduit/perl-conduit.desktop,v
retrieving revision 1.26.2.11
retrieving revision 1.26.2.13
-diff -u -r1.26.2.11 -r1.26.2.13
+diff -u -d -r1.26.2.11 -r1.26.2.13
--- kpilot/conduits/perlconduit/perl-conduit.desktop 19 Nov 2004 07:37:43 -0000 1.26.2.11
+++ kpilot/conduits/perlconduit/perl-conduit.desktop 9 Jan 2005 07:49:27 -0000 1.26.2.13
@@ -2,6 +2,7 @@
@@ -7319,7 +7384,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/popmail/popmail-conduit.desktop,v
retrieving revision 1.136.2.3
retrieving revision 1.136.2.6
-diff -u -r1.136.2.3 -r1.136.2.6
+diff -u -d -r1.136.2.3 -r1.136.2.6
--- kpilot/conduits/popmail/popmail-conduit.desktop 24 Oct 2004 07:06:07 -0000 1.136.2.3
+++ kpilot/conduits/popmail/popmail-conduit.desktop 26 Jan 2005 08:10:32 -0000 1.136.2.6
@@ -2,6 +2,7 @@
@@ -7351,7 +7416,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/pythonconduit/python-conduit.desktop,v
retrieving revision 1.26.2.11
retrieving revision 1.26.2.13
-diff -u -r1.26.2.11 -r1.26.2.13
+diff -u -d -r1.26.2.11 -r1.26.2.13
--- kpilot/conduits/pythonconduit/python-conduit.desktop 19 Nov 2004 07:37:44 -0000 1.26.2.11
+++ kpilot/conduits/pythonconduit/python-conduit.desktop 9 Jan 2005 07:49:28 -0000 1.26.2.13
@@ -2,6 +2,7 @@
@@ -7383,7 +7448,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.7
-diff -u -r1.48.2.5 -r1.48.2.7
+diff -u -d -r1.48.2.5 -r1.48.2.7
--- kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop 22 Nov 2004 08:35:08 -0000 1.48.2.5
+++ kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop 9 Jan 2005 07:49:28 -0000 1.48.2.7
@@ -2,6 +2,7 @@
@@ -7415,7 +7480,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/timeconduit/time_conduit.desktop,v
retrieving revision 1.79.2.3
retrieving revision 1.79.2.4
-diff -u -r1.79.2.3 -r1.79.2.4
+diff -u -d -r1.79.2.3 -r1.79.2.4
--- kpilot/conduits/timeconduit/time_conduit.desktop 10 Nov 2004 07:37:30 -0000 1.79.2.3
+++ kpilot/conduits/timeconduit/time_conduit.desktop 29 Dec 2004 21:45:10 -0000 1.79.2.4
@@ -2,6 +2,7 @@
@@ -7431,7 +7496,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/vcalconduit/todo-conduit.desktop,v
retrieving revision 1.133.2.8
retrieving revision 1.133.2.10
-diff -u -r1.133.2.8 -r1.133.2.10
+diff -u -d -r1.133.2.8 -r1.133.2.10
--- kpilot/conduits/vcalconduit/todo-conduit.desktop 13 Nov 2004 07:20:58 -0000 1.133.2.8
+++ kpilot/conduits/vcalconduit/todo-conduit.desktop 9 Jan 2005 07:49:28 -0000 1.133.2.10
@@ -2,6 +2,7 @@
@@ -7463,7 +7528,7 @@
RCS file: /home/kde/kdepim/kpilot/conduits/vcalconduit/vcal-conduit.desktop,v
retrieving revision 1.210.2.12
retrieving revision 1.210.2.16
-diff -u -r1.210.2.12 -r1.210.2.16
+diff -u -d -r1.210.2.12 -r1.210.2.16
--- kpilot/conduits/vcalconduit/vcal-conduit.desktop 18 Nov 2004 07:30:47 -0000 1.210.2.12
+++ kpilot/conduits/vcalconduit/vcal-conduit.desktop 9 Jan 2005 07:49:28 -0000 1.210.2.16
@@ -2,6 +2,7 @@
@@ -7497,7 +7562,7 @@
RCS file: /home/kde/kdepim/kpilot/kpilot/kpilot.desktop,v
retrieving revision 1.102.2.2
retrieving revision 1.102.2.4
-diff -u -r1.102.2.2 -r1.102.2.4
+diff -u -d -r1.102.2.2 -r1.102.2.4
--- kpilot/kpilot/kpilot.desktop 31 Aug 2004 07:23:30 -0000 1.102.2.2
+++ kpilot/kpilot/kpilot.desktop 17 Dec 2004 07:31:44 -0000 1.102.2.4
@@ -17,6 +17,7 @@
@@ -7521,7 +7586,7 @@
RCS file: /home/kde/kdepim/kpilot/kpilot/kpilot_config.desktop,v
retrieving revision 1.29.2.11
retrieving revision 1.29.2.13
-diff -u -r1.29.2.11 -r1.29.2.13
+diff -u -d -r1.29.2.11 -r1.29.2.13
--- kpilot/kpilot/kpilot_config.desktop 13 Nov 2004 07:20:58 -0000 1.29.2.11
+++ kpilot/kpilot/kpilot_config.desktop 9 Jan 2005 07:49:29 -0000 1.29.2.13
@@ -12,6 +12,7 @@
@@ -7561,7 +7626,7 @@
RCS file: /home/kde/kdepim/kpilot/kpilot/kpilotdaemon.desktop,v
retrieving revision 1.87.2.2
retrieving revision 1.87.2.3
-diff -u -r1.87.2.2 -r1.87.2.3
+diff -u -d -r1.87.2.2 -r1.87.2.3
--- kpilot/kpilot/kpilotdaemon.desktop 24 Oct 2004 07:06:09 -0000 1.87.2.2
+++ kpilot/kpilot/kpilotdaemon.desktop 12 Dec 2004 08:32:51 -0000 1.87.2.3
@@ -16,6 +16,7 @@
@@ -7577,7 +7642,7 @@
RCS file: /home/kde/kdepim/kresources/egroupware/kabc_xmlrpc.desktop,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
-diff -u -r1.8.2.1 -r1.8.2.2
+diff -u -d -r1.8.2.1 -r1.8.2.2
--- kresources/egroupware/kabc_xmlrpc.desktop 24 Aug 2004 06:32:46 -0000 1.8.2.1
+++ kresources/egroupware/kabc_xmlrpc.desktop 5 Jan 2005 07:50:33 -0000 1.8.2.2
@@ -1,6 +1,7 @@
@@ -7593,7 +7658,7 @@
RCS file: /home/kde/kdepim/kresources/egroupware/kcal_xmlrpc.desktop,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
-diff -u -r1.7.2.1 -r1.7.2.2
+diff -u -d -r1.7.2.1 -r1.7.2.2
--- kresources/egroupware/kcal_xmlrpc.desktop 24 Aug 2004 06:32:46 -0000 1.7.2.1
+++ kresources/egroupware/kcal_xmlrpc.desktop 5 Jan 2005 07:50:33 -0000 1.7.2.2
@@ -1,6 +1,7 @@
@@ -7609,7 +7674,7 @@
RCS file: /home/kde/kdepim/kresources/egroupware/knotes_xmlrpc.desktop,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
-diff -u -r1.4.2.1 -r1.4.2.2
+diff -u -d -r1.4.2.1 -r1.4.2.2
--- kresources/egroupware/knotes_xmlrpc.desktop 24 Aug 2004 06:32:46 -0000 1.4.2.1
+++ kresources/egroupware/knotes_xmlrpc.desktop 5 Jan 2005 07:50:33 -0000 1.4.2.2
@@ -1,6 +1,7 @@
@@ -7625,7 +7690,7 @@
RCS file: /home/kde/kdepim/kresources/exchange/exchange.desktop,v
retrieving revision 1.54.2.8
retrieving revision 1.54.2.9
-diff -u -r1.54.2.8 -r1.54.2.9
+diff -u -d -r1.54.2.8 -r1.54.2.9
--- kresources/exchange/exchange.desktop 13 Nov 2004 07:20:58 -0000 1.54.2.8
+++ kresources/exchange/exchange.desktop 5 Jan 2005 07:50:33 -0000 1.54.2.9
@@ -6,6 +6,7 @@
@@ -7641,7 +7706,7 @@
RCS file: /home/kde/kdepim/kresources/imap/kcal/Attic/imap.desktop,v
retrieving revision 1.25.2.8
retrieving revision 1.25.2.10
-diff -u -r1.25.2.8 -r1.25.2.10
+diff -u -d -r1.25.2.8 -r1.25.2.10
--- kresources/imap/kcal/imap.desktop 13 Nov 2004 07:20:59 -0000 1.25.2.8
+++ kresources/imap/kcal/imap.desktop 18 Jan 2005 08:14:44 -0000 1.25.2.10
@@ -1,7 +1,9 @@
@@ -7659,7 +7724,7 @@
RCS file: /home/kde/kdepim/kresources/remote/remote.desktop,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
-diff -u -r1.5.2.3 -r1.5.2.4
+diff -u -d -r1.5.2.3 -r1.5.2.4
--- kresources/remote/remote.desktop 10 Nov 2004 07:37:31 -0000 1.5.2.3
+++ kresources/remote/remote.desktop 29 Dec 2004 21:45:11 -0000 1.5.2.4
@@ -2,6 +2,7 @@
@@ -7675,7 +7740,7 @@
RCS file: /home/kde/kdepim/kresources/slox/kabc_slox.desktop,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
-diff -u -r1.2.2.1 -r1.2.2.2
+diff -u -d -r1.2.2.1 -r1.2.2.2
--- kresources/slox/kabc_slox.desktop 24 Aug 2004 06:32:48 -0000 1.2.2.1
+++ kresources/slox/kabc_slox.desktop 5 Jan 2005 07:50:34 -0000 1.2.2.2
@@ -1,6 +1,7 @@
@@ -7691,7 +7756,7 @@
RCS file: /home/kde/kdepim/kresources/slox/sloxaccounts.cpp,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
-diff -u -r1.5.2.2 -r1.5.2.3
+diff -u -d -r1.5.2.2 -r1.5.2.3
--- kresources/slox/sloxaccounts.cpp 24 Nov 2004 10:58:02 -0000 1.5.2.2
+++ kresources/slox/sloxaccounts.cpp 2 Dec 2004 09:55:40 -0000 1.5.2.3
@@ -137,10 +137,9 @@
@@ -7712,7 +7777,7 @@
RCS file: /home/kde/kdepim/ksync/src/ksync.desktop,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
-diff -u -r1.29.2.1 -r1.29.2.2
+diff -u -d -r1.29.2.1 -r1.29.2.2
--- ksync/src/ksync.desktop 24 Aug 2004 06:32:50 -0000 1.29.2.1
+++ ksync/src/ksync.desktop 12 Dec 2004 08:32:51 -0000 1.29.2.2
@@ -13,6 +13,7 @@
@@ -7728,7 +7793,7 @@
RCS file: /home/kde/kdepim/ktnef/gui/ktnef.desktop,v
retrieving revision 1.55.2.4
retrieving revision 1.55.2.6
-diff -u -r1.55.2.4 -r1.55.2.6
+diff -u -d -r1.55.2.4 -r1.55.2.6
--- ktnef/gui/ktnef.desktop 24 Oct 2004 07:06:09 -0000 1.55.2.4
+++ ktnef/gui/ktnef.desktop 23 Feb 2005 09:00:26 -0000 1.55.2.6
@@ -1,5 +1,6 @@
@@ -7759,7 +7824,7 @@
RCS file: /home/kde/kdepim/ktnef/gui/ms-tnef.desktop,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.5
-diff -u -r1.41.2.3 -r1.41.2.5
+diff -u -d -r1.41.2.3 -r1.41.2.5
--- ktnef/gui/ms-tnef.desktop 22 Nov 2004 08:35:08 -0000 1.41.2.3
+++ ktnef/gui/ms-tnef.desktop 26 Jan 2005 08:10:33 -0000 1.41.2.5
@@ -4,6 +4,7 @@
@@ -7783,7 +7848,7 @@
RCS file: /home/kde/kdepim/libical/src/libicalss/Attic/icalclassify.c,v
retrieving revision 1.5
retrieving revision 1.5.8.4
-diff -u -r1.5 -r1.5.8.4
+diff -u -d -r1.5 -r1.5.8.4
--- libical/src/libicalss/icalclassify.c 22 Jan 2003 11:20:53 -0000 1.5
+++ libical/src/libicalss/icalclassify.c 7 Jan 2005 23:03:33 -0000 1.5.8.4
@@ -3,7 +3,7 @@
@@ -7853,7 +7918,7 @@
RCS file: /home/kde/kdepim/libkcal/kabc.desktop,v
retrieving revision 1.57.2.2
retrieving revision 1.57.2.4
-diff -u -r1.57.2.2 -r1.57.2.4
+diff -u -d -r1.57.2.2 -r1.57.2.4
--- libkcal/kabc.desktop 24 Oct 2004 07:06:10 -0000 1.57.2.2
+++ libkcal/kabc.desktop 10 Jan 2005 09:02:04 -0000 1.57.2.4
@@ -1,8 +1,10 @@
@@ -7872,7 +7937,7 @@
RCS file: /home/kde/kdepim/libkcal/local.desktop,v
retrieving revision 1.53.2.4
retrieving revision 1.53.2.5
-diff -u -r1.53.2.4 -r1.53.2.5
+diff -u -d -r1.53.2.4 -r1.53.2.5
--- libkcal/local.desktop 10 Nov 2004 07:37:32 -0000 1.53.2.4
+++ libkcal/local.desktop 29 Dec 2004 21:45:12 -0000 1.53.2.5
@@ -3,6 +3,7 @@
@@ -7888,7 +7953,7 @@
RCS file: /home/kde/kdepim/libkcal/localdir.desktop,v
retrieving revision 1.55.2.3
retrieving revision 1.55.2.5
-diff -u -r1.55.2.3 -r1.55.2.5
+diff -u -d -r1.55.2.3 -r1.55.2.5
--- libkcal/localdir.desktop 10 Nov 2004 07:37:32 -0000 1.55.2.3
+++ libkcal/localdir.desktop 18 Jan 2005 08:14:44 -0000 1.55.2.5
@@ -1,8 +1,10 @@
@@ -7902,12 +7967,39 @@
Name[bs]=Kalendar u lokalnom direktoriju
Name[ca]=Calendari a un directori local
Name[cs]=Kalendář v lokální složce
+Index: libkcal/recurrence.cpp
+===================================================================
+RCS file: /home/kde/kdepim/libkcal/recurrence.cpp,v
+retrieving revision 1.44
+retrieving revision 1.44.2.1
+diff -u -d -r1.44 -r1.44.2.1
+--- libkcal/recurrence.cpp 19 Jul 2004 19:18:15 -0000 1.44
++++ libkcal/recurrence.cpp 22 Mar 2005 19:05:02 -0000 1.44.2.1
+@@ -572,7 +572,7 @@
+
+ void Recurrence::addMonthlyPos(short _rPos, const QBitArray &_rDays)
+ {
+- if (recurs == rMonthlyPos)
++ if ( recurs == rMonthlyPos || recurs == rYearlyPos )
+ addMonthlyPos_(_rPos, _rDays);
+ }
+
+@@ -3532,4 +3532,9 @@
+ kdDebug(5800) << " " << i << ": "
+ << ( rDays.testBit( i ) ? "true" : "false" ) << endl;
+ }
++ kdDebug(5800) << " duration: " << rDuration << endl;
++
++ for (QPtrListIterator<int> it(rMonthDays); it.current(); ++it) {
++ kdDebug(5800) << " monthday: " << *(it.current()) << endl;
++ }
+ }
Index: libkcal/vcalformat.cpp
===================================================================
RCS file: /home/kde/kdepim/libkcal/vcalformat.cpp,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
-diff -u -r1.42.2.1 -r1.42.2.2
+diff -u -d -r1.42.2.1 -r1.42.2.2
--- libkcal/vcalformat.cpp 7 Oct 2004 09:20:12 -0000 1.42.2.1
+++ libkcal/vcalformat.cpp 7 Jan 2005 17:51:38 -0000 1.42.2.2
@@ -266,7 +266,7 @@
@@ -7933,7 +8025,7 @@
RCS file: /home/kde/kdepim/libkcal/versit/vcc.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
-diff -u -r1.4 -r1.4.2.1
+diff -u -d -r1.4 -r1.4.2.1
--- libkcal/versit/vcc.c 22 Jul 2004 21:51:23 -0000 1.4
+++ libkcal/versit/vcc.c 13 Dec 2004 01:56:50 -0000 1.4.2.1
@@ -1,29 +1,102 @@
@@ -7949,12 +8041,31 @@
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
-+
+
+-#define EQ 257
+-#define COLON 258
+-#define DOT 259
+-#define SEMICOLON 260
+-#define SPACE 261
+-#define HTAB 262
+-#define LINESEP 263
+-#define NEWLINE 264
+-#define BEGIN_VCARD 265
+-#define END_VCARD 266
+-#define BEGIN_VCAL 267
+-#define END_VCAL 268
+-#define BEGIN_VEVENT 269
+-#define END_VEVENT 270
+-#define BEGIN_VTODO 271
+-#define END_VTODO 272
+-#define ID 273
+-#define STRING 274
+ 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.
-+
+
+-#line 1 "./vcc.y"
+ 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., 59 Temple Place - Suite 330,
@@ -8033,29 +8144,10 @@
+#define END_VTODO 273
+#define ID 274
+#define STRING 275
-
--#define EQ 257
--#define COLON 258
--#define DOT 259
--#define SEMICOLON 260
--#define SPACE 261
--#define HTAB 262
--#define LINESEP 263
--#define NEWLINE 264
--#define BEGIN_VCARD 265
--#define END_VCARD 266
--#define BEGIN_VCAL 267
--#define END_VCAL 268
--#define BEGIN_VEVENT 269
--#define END_VEVENT 270
--#define BEGIN_VTODO 271
--#define END_VTODO 272
--#define ID 273
--#define STRING 274
-
--#line 1 "./vcc.y"
+
+
++
++
+/* Copy the first part of user declarations. */
+#line 1 "vcc.y"
@@ -8108,21 +8200,68 @@
VObject *vobj;
} YYSTYPE;
-#include <stdio.h>
+-
+-#ifndef __cplusplus
+-#ifndef __STDC__
+-#define const
+-#endif
+/* Line 191 of yacc.c. */
+#line 300 "vcc.tab.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
-+#endif
-+
-+
-+
+ #endif
+
+
+
+-#define YYFINAL 62
+-#define YYFLAG -32768
+-#define YYNTBASE 21
+/* Copy the second part of user declarations. */
-+
-+
+
+-#define YYTRANSLATE(x) ((unsigned)(x) <= 274 ? yytranslate[x] : 51)
+
+-static const char yytranslate[] = { 0,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+- 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
+- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+- 17, 18, 19, 20
+-};
+/* Line 214 of yacc.c. */
+#line 312 "vcc.tab.c"
-+
+
+-#if YYDEBUG != 0
+-static const short yyprhs[] = { 0,
+- 0, 2, 3, 7, 9, 11, 13, 14, 19, 20,
+- 24, 27, 29, 30, 36, 38, 39, 43, 45, 48,
+- 50, 53, 55, 59, 61, 62, 67, 69, 71, 72,
+- 73, 78, 79, 83, 86, 88, 90, 92, 94, 95,
+- 100, 101, 105, 106, 111, 112
+-};
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -8153,8 +8292,22 @@
+# define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+-static const short yyrhs[] = { 22,
+- 0, 0, 24, 23, 22, 0, 24, 0, 25, 0,
+- 40, 0, 0, 11, 26, 28, 12, 0, 0, 11,
+- 27, 12, 0, 29, 28, 0, 29, 0, 0, 31,
+- 4, 30, 37, 9, 0, 1, 0, 0, 36, 32,
+- 33, 0, 36, 0, 34, 33, 0, 34, 0, 6,
+- 35, 0, 36, 0, 36, 3, 36, 0, 19, 0,
+- 0, 39, 6, 38, 37, 0, 39, 0, 20, 0,
+- 0, 0, 13, 41, 43, 14, 0, 0, 13, 42,
+- 14, 0, 44, 43, 0, 44, 0, 45, 0, 48,
+- 0, 28, 0, 0, 15, 46, 28, 16, 0, 0,
+- 15, 47, 16, 0, 0, 17, 49, 28, 18, 0,
+- 0, 17, 50, 18, 0
+-};
+
-+
+#if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+ || (YYSTYPE_IS_TRIVIAL)))
@@ -8209,59 +8362,28 @@
+ } \
+ while (0)
--#ifndef __cplusplus
--#ifndef __STDC__
--#define const
#endif
--#endif
--
+-#if YYDEBUG != 0
+-static const short yyrline[] = { 0,
+- 209, 212, 215, 215, 219, 220, 223, 229, 234, 240,
+- 246, 247, 250, 254, 260, 263, 268, 268, 274, 275,
+- 278, 281, 285, 292, 295, 296, 296, 300, 301, 305,
+- 309, 311, 314, 317, 318, 321, 323, 324, 327, 334,
+- 339, 345, 351, 358, 363, 369
+-};
+#if defined (__STDC__) || defined (__cplusplus)
+ typedef signed char yysigned_char;
+#else
+ typedef short yysigned_char;
-+#endif
+ #endif
--#define YYFINAL 62
--#define YYFLAG -32768
--#define YYNTBASE 21
--
--#define YYTRANSLATE(x) ((unsigned)(x) <= 274 ? yytranslate[x] : 51)
--
--static const char yytranslate[] = { 0,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
-- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-- 17, 18, 19, 20
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL 12
+/* YYLAST -- Last index in YYTABLE. */
+#define YYLAST 56
-+
+
+-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS 21
+/* YYNNTS -- Number of nonterminals. */
@@ -8270,14 +8392,36 @@
+#define YYNRULES 47
+/* YYNRULES -- Number of states. */
+#define YYNSTATES 62
-+
+
+-static const char * const yytname[] = { "$","error","$undefined.","EQ","COLON",
+-"DOT","SEMICOLON","SPACE","HTAB","LINESEP","NEWLINE","BEGIN_VCARD","END_VCARD",
+-"BEGIN_VCAL","END_VCAL","BEGIN_VEVENT","END_VEVENT","BEGIN_VTODO","END_VTODO",
+-"ID","STRING","mime","vobjects","@1","vobject","vcard","@2","@3","items","item",
+-"@4","prop","@5","attr_params","attr_param","attr","name","values","@6","value",
+-"vcal","@7","@8","calitems","calitem","eventitem","@9","@10","todoitem","@11",
+-"@12", NULL
+-};
+-#endif
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+#define YYUNDEFTOK 2
+#define YYMAXUTOK 275
-+
+
+-static const short yyr1[] = { 0,
+- 21, 23, 22, 22, 24, 24, 26, 25, 27, 25,
+- 28, 28, 30, 29, 29, 32, 31, 31, 33, 33,
+- 34, 35, 35, 36, 38, 37, 37, 39, 39, 41,
+- 40, 42, 40, 43, 43, 44, 44, 44, 46, 45,
+- 47, 45, 49, 48, 50, 48
+-};
+#define YYTRANSLATE(YYX) \
+ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-+
+
+-static const short yyr2[] = { 0,
+- 1, 0, 3, 1, 1, 1, 0, 4, 0, 3,
+- 2, 1, 0, 5, 1, 0, 3, 1, 2, 1,
+- 2, 1, 3, 1, 0, 4, 1, 1, 0, 0,
+- 4, 0, 3, 2, 1, 1, 1, 1, 0, 4,
+- 0, 3, 0, 4, 0, 3
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+static const unsigned char yytranslate[] =
+{
@@ -8311,13 +8455,14 @@
+ 15, 16, 17, 18, 19, 20
};
--#if YYDEBUG != 0
--static const short yyprhs[] = { 0,
-- 0, 2, 3, 7, 9, 11, 13, 14, 19, 20,
-- 24, 27, 29, 30, 36, 38, 39, 43, 45, 48,
-- 50, 53, 55, 59, 61, 62, 67, 69, 71, 72,
-- 73, 78, 79, 83, 86, 88, 90, 92, 94, 95,
-- 100, 101, 105, 106, 111, 112
+-static const short yydefact[] = { 0,
+- 7, 30, 1, 2, 5, 6, 0, 0, 0, 0,
+- 0, 15, 24, 0, 0, 0, 16, 10, 39, 43,
+- 38, 0, 0, 36, 37, 33, 3, 8, 11, 13,
+- 0, 0, 0, 0, 0, 31, 34, 29, 0, 17,
+- 20, 0, 42, 0, 46, 28, 0, 27, 21, 22,
+- 19, 40, 44, 14, 25, 0, 29, 23, 26, 0,
+- 0, 0
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+ YYRHS. */
@@ -8330,19 +8475,10 @@
+ 97, 98, 103, 104, 108, 109, 114, 115
};
--static const short yyrhs[] = { 22,
-- 0, 0, 24, 23, 22, 0, 24, 0, 25, 0,
-- 40, 0, 0, 11, 26, 28, 12, 0, 0, 11,
-- 27, 12, 0, 29, 28, 0, 29, 0, 0, 31,
-- 4, 30, 37, 9, 0, 1, 0, 0, 36, 32,
-- 33, 0, 36, 0, 34, 33, 0, 34, 0, 6,
-- 35, 0, 36, 0, 36, 3, 36, 0, 19, 0,
-- 0, 39, 6, 38, 37, 0, 39, 0, 20, 0,
-- 0, 0, 13, 41, 43, 14, 0, 0, 13, 42,
-- 14, 0, 44, 43, 0, 44, 0, 45, 0, 48,
-- 0, 28, 0, 0, 15, 46, 28, 16, 0, 0,
-- 15, 47, 16, 0, 0, 17, 49, 28, 18, 0,
-- 0, 17, 50, 18, 0
+-static const short yydefgoto[] = { 60,
+- 3, 11, 4, 5, 7, 8, 21, 15, 38, 16,
+- 31, 40, 41, 49, 17, 47, 57, 48, 6, 9,
+- 10, 22, 23, 24, 32, 33, 25, 34, 35
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
@@ -8360,15 +8496,14 @@
+ 50, 29, 18, -1, -1, 17, 51, 18, -1
};
--#endif
--
--#if YYDEBUG != 0
--static const short yyrline[] = { 0,
-- 209, 212, 215, 215, 219, 220, 223, 229, 234, 240,
-- 246, 247, 250, 254, 260, 263, 268, 268, 274, 275,
-- 278, 281, 285, 292, 295, 296, 296, 300, 301, 305,
-- 309, 311, 314, 317, 318, 321, 323, 324, 327, 334,
-- 339, 345, 351, 358, 363, 369
+-static const short yypact[] = { -9,
+- -6, -5,-32768, 7,-32768,-32768, 2, -1, 19, 15,
+- -9,-32768,-32768, 1, 0, 26, 27,-32768, 16, 17,
+--32768, 23, 9,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+- 33, 2, 24, 2, 25,-32768,-32768, 13, 22,-32768,
+- 33, 28,-32768, 29,-32768,-32768, 36, 40,-32768, 39,
+--32768,-32768,-32768,-32768,-32768, 22, 13,-32768,-32768, 48,
+- 49,-32768
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const unsigned short yyrline[] =
+{
@@ -8378,18 +8513,12 @@
+ 306, 311, 310, 316, 315, 321, 322, 326, 327, 328,
+ 333, 332, 344, 343, 357, 356, 368, 367
};
- #endif
++#endif
--
--#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
--
--static const char * const yytname[] = { "$","error","$undefined.","EQ","COLON",
--"DOT","SEMICOLON","SPACE","HTAB","LINESEP","NEWLINE","BEGIN_VCARD","END_VCARD",
--"BEGIN_VCAL","END_VCAL","BEGIN_VEVENT","END_VEVENT","BEGIN_VTODO","END_VTODO",
--"ID","STRING","mime","vobjects","@1","vobject","vcard","@2","@3","items","item",
--"@4","prop","@5","attr_params","attr_param","attr","name","values","@6","value",
--"vcal","@7","@8","calitems","calitem","eventitem","@9","@10","todoitem","@11",
--"@12", NULL
+-static const short yypgoto[] = {-32768,
+- 41,-32768,-32768,-32768,-32768,-32768, -7,-32768,-32768,-32768,
+--32768, 10,-32768,-32768, -34, -4,-32768,-32768,-32768,-32768,
+--32768, 31,-32768,-32768,-32768,-32768,-32768,-32768,-32768
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
@@ -8404,14 +8533,8 @@
+ "@8", "calitems", "calitem", "eventitem", "@9", "@10", "todoitem",
+ "@11", "@12", 0
};
- #endif
++#endif
--static const short yyr1[] = { 0,
-- 21, 23, 22, 22, 24, 24, 26, 25, 27, 25,
-- 28, 28, 30, 29, 29, 32, 31, 31, 33, 33,
-- 34, 35, 35, 36, 38, 37, 37, 39, 39, 41,
-- 40, 42, 40, 43, 43, 44, 44, 44, 46, 45,
-- 47, 45, 49, 48, 50, 48
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+ token YYLEX-NUM. */
@@ -8420,15 +8543,11 @@
+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+ 275
- };
++};
+# endif
--static const short yyr2[] = { 0,
-- 1, 0, 3, 1, 1, 1, 0, 4, 0, 3,
-- 2, 1, 0, 5, 1, 0, 3, 1, 2, 1,
-- 2, 1, 3, 1, 0, 4, 1, 1, 0, 0,
-- 4, 0, 3, 2, 1, 1, 1, 1, 0, 4,
-- 0, 3, 0, 4, 0, 3
+-#define YYLAST 54
+-
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const unsigned char yyr1[] =
+{
@@ -8437,16 +8556,15 @@
+ 34, 34, 35, 36, 36, 37, 39, 38, 38, 40,
+ 40, 42, 41, 43, 41, 44, 44, 45, 45, 45,
+ 47, 46, 48, 46, 50, 49, 51, 49
- };
++};
--static const short yydefact[] = { 0,
-- 7, 30, 1, 2, 5, 6, 0, 0, 0, 0,
-- 0, 15, 24, 0, 0, 0, 16, 10, 39, 43,
-- 38, 0, 0, 36, 37, 33, 3, 8, 11, 13,
-- 0, 0, 0, 0, 0, 31, 34, 29, 0, 17,
-- 20, 0, 42, 0, 46, 28, 0, 27, 21, 22,
-- 19, 40, 44, 14, 25, 0, 29, 23, 26, 0,
-- 0, 0
+-static const short yytable[] = { 14,
+- 12, 1, 12, 2, 50, -9, -4, 29, -32, 12,
+- 18, -12, 28, -12, -12, -12, -12, -12, 13, 12,
+- 13, 58, -35, 19, 42, 20, 44, 13, 26, 30,
+- -18, -41, 46, 19, -45, 20, 36, 13, 39, 43,
+- 13, 56, 45, 52, 54, 55, 53, 61, 62, 0,
+- 51, 27, 59, 37
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const unsigned char yyr2[] =
+{
@@ -8457,10 +8575,13 @@
+ 0, 4, 0, 3, 0, 4, 0, 3
};
--static const short yydefgoto[] = { 60,
-- 3, 11, 4, 5, 7, 8, 21, 15, 38, 16,
-- 31, 40, 41, 49, 17, 47, 57, 48, 6, 9,
-- 10, 22, 23, 24, 32, 33, 25, 34, 35
+-static const short yycheck[] = { 7,
+- 1, 11, 1, 13, 39, 12, 0, 15, 14, 1,
+- 12, 12, 12, 14, 15, 16, 17, 18, 19, 1,
+- 19, 56, 14, 15, 32, 17, 34, 19, 14, 4,
+- 4, 16, 20, 15, 18, 17, 14, 19, 6, 16,
+- 19, 3, 18, 16, 9, 6, 18, 0, 0, -1,
+- 41, 11, 57, 23
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+ STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+ means the default is an error. */
@@ -8474,15 +8595,12 @@
+ 28, 22, 23, 20, 41, 45, 15, 26, 0, 30,
+ 24, 27
};
+-/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
+-#line 3 "/usr/share/bison.simple"
+-/* This file comes from bison-1.28. */
--static const short yypact[] = { -9,
-- -6, -5,-32768, 7,-32768,-32768, 2, -1, 19, 15,
-- -9,-32768,-32768, 1, 0, 26, 27,-32768, 16, 17,
---32768, 23, 9,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-- 33, 2, 24, 2, 25,-32768,-32768, 13, 22,-32768,
-- 33, 28,-32768, 29,-32768,-32768, 36, 40,-32768, 39,
---32768,-32768,-32768,-32768,-32768, 22, 13,-32768,-32768, 48,
-- 49,-32768
+-/* Skeleton output parser for bison,
+- Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+/* YYDEFGOTO[NTERM-NUM]. */
+static const yysigned_char yydefgoto[] =
+{
@@ -8490,12 +8608,12 @@
+ 40, 18, 33, 42, 43, 51, 19, 49, 59, 50,
+ 7, 10, 11, 24, 25, 26, 34, 35, 27, 36,
+ 37
- };
++};
--static const short yypgoto[] = {-32768,
-- 41,-32768,-32768,-32768,-32768,-32768, -7,-32768,-32768,-32768,
---32768, 10,-32768,-32768, -34, -4,-32768,-32768,-32768,-32768,
---32768, 31,-32768,-32768,-32768,-32768,-32768,-32768,-32768
+- 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, or (at your option)
+- any later version.
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+#define YYPACT_NINF -18
@@ -8508,19 +8626,12 @@
+ 22, 25, -18, 32, 27, -18, 28, -18, -18, 36,
+ 41, -18, 45, -18, -18, -18, -18, -18, 25, 22,
+ -18, -18
- };
++};
--
--#define YYLAST 54
--
--
--static const short yytable[] = { 14,
-- 12, 1, 12, 2, 50, -9, -4, 29, -32, 12,
-- 18, -12, 28, -12, -12, -12, -12, -12, 13, 12,
-- 13, 58, -35, 19, 42, 20, 44, 13, 26, 30,
-- -18, -41, 46, 19, -45, 20, 36, 13, 39, 43,
-- 13, 56, 45, 52, 54, 55, 53, 61, 62, 0,
-- 51, 27, 59, 37
+- 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.
+/* YYPGOTO[NTERM-NUM]. */
+static const yysigned_char yypgoto[] =
+{
@@ -8528,15 +8639,12 @@
+ -18, -18, -18, 8, -18, -18, -17, -7, -18, -18,
+ -18, -18, -18, 31, -18, -18, -18, -18, -18, -18,
+ -18
- };
++};
--static const short yycheck[] = { 7,
-- 1, 11, 1, 13, 39, 12, 0, 15, 14, 1,
-- 12, 12, 12, 14, 15, 16, 17, 18, 19, 1,
-- 19, 56, 14, 15, 32, 17, 34, 19, 14, 4,
-- 4, 16, 20, 15, 18, 17, 14, 19, 6, 16,
-- 19, 3, 18, 16, 9, 6, 18, 0, 0, -1,
-- 41, 11, 57, 23
+- 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., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
+/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule which
+ number is the opposite. If zero, do what YYDEFACT says.
@@ -8550,28 +8658,12 @@
+ 28, 15, 30, 32, -19, -42, -46, 38, 41, 47,
+ 45, 60, 48, 54, 15, 56, 55, 57, 58, 0,
+ 29, 53, 61, 0, 0, 0, 39
- };
--/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
--#line 3 "/usr/share/bison.simple"
--/* This file comes from bison-1.28. */
--
--/* Skeleton output parser for bison,
-- Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
--
-- 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, or (at your option)
-- any later version.
--
-- 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.
++};
-- 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., 59 Temple Place - Suite 330,
-- Boston, MA 02111-1307, USA. */
+-/* As a special exception, when this file is copied by Bison into a
+- Bison output file, you may use that output file without restriction.
+- This special exception was added by the Free Software Foundation
+- in version 1.24 of Bison. */
+static const yysigned_char yycheck[] =
+{
+ 8, 1, 12, 14, 1, 0, 11, 1, 13, 17,
@@ -8582,10 +8674,10 @@
+ 13, 43, 59, -1, -1, -1, 25
+};
--/* As a special exception, when this file is copied by Bison into a
-- Bison output file, you may use that output file without restriction.
-- This special exception was added by the Free Software Foundation
-- in version 1.24 of Bison. */
+-/* This is the parser code that is written into each bison parser
+- when the %semantic_parser declaration is not specified in the grammar.
+- It was written by Richard Stallman by simplifying the hairy parser
+- used when %semantic_parser is specified. */
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
+static const unsigned char yystos[] =
@@ -8599,11 +8691,6 @@
+ 37, 38
+};
--/* This is the parser code that is written into each bison parser
-- when the %semantic_parser declaration is not specified in the grammar.
-- It was written by Richard Stallman by simplifying the hairy parser
-- used when %semantic_parser is specified. */
--
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
@@ -8640,7 +8727,9 @@
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
--#endif
++#if ! defined (YYSIZE_T) && defined (size_t)
++# define YYSIZE_T size_t
+ #endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
@@ -8652,9 +8741,6 @@
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-+#if ! defined (YYSIZE_T) && defined (size_t)
-+# define YYSIZE_T size_t
-+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
@@ -8717,16 +8803,9 @@
-#ifndef YYPURE
-#define YYLEX yylex()
--#endif
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+ are run). */
-
--#ifdef YYPURE
--#ifdef YYLSP_NEEDED
--#ifdef YYLEX_PARAM
--#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
--#else
--#define YYLEX yylex(&yylval, &yylloc)
++
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ Current.first_line = Rhs[1].first_line; \
@@ -8734,25 +8813,25 @@
+ Current.last_line = Rhs[N].last_line; \
+ Current.last_column = Rhs[N].last_column;
#endif
--#else /* not YYLSP_NEEDED */
-+
+
+-#ifdef YYPURE
+-#ifdef YYLSP_NEEDED
+/* YYLEX -- calling `yylex' with the right arguments. */
+
#ifdef YYLEX_PARAM
--#define YYLEX yylex(&yylval, YYLEX_PARAM)
+-#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
+# define YYLEX yylex (YYLEX_PARAM)
#else
--#define YYLEX yylex(&yylval)
--#endif
--#endif /* not YYLSP_NEEDED */
+-#define YYLEX yylex(&yylval, &yylloc)
+# define YYLEX yylex ()
#endif
-
--/* If nonreentrant, generate the variables here */
+-#else /* not YYLSP_NEEDED */
+-#ifdef YYLEX_PARAM
+-#define YYLEX yylex(&yylval, YYLEX_PARAM)
++
+/* Enable debugging if requested. */
+#if YYDEBUG
-
--#ifndef YYPURE
++
+# ifndef YYFPRINTF
+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
@@ -8780,22 +8859,19 @@
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
-
--int yychar; /* the lookahead symbol */
--YYSTYPE yylval; /* the semantic value of the */
-- /* lookahead symbol */
++
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (cinluded). |
+`------------------------------------------------------------------*/
-
--#ifdef YYLSP_NEEDED
--YYLTYPE yylloc; /* location data for the lookahead */
-- /* symbol */
++
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short *bottom, short *top)
-+#else
+ #else
+-#define YYLEX yylex(&yylval)
+-#endif
+-#endif /* not YYLSP_NEEDED */
+static void
+yy_stack_print (bottom, top)
+ short *bottom;
@@ -8808,23 +8884,25 @@
+ YYFPRINTF (stderr, "\n");
+}
--int yynerrs; /* number of parse errors so far */
--#endif /* not YYPURE */
+-/* If nonreentrant, generate the variables here */
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (0)
--#if YYDEBUG != 0
--int yydebug; /* nonzero means print parse trace */
--/* Since this is uninitialized, it does not stop multiple parsers
-- from coexisting. */
-+
+-#ifndef YYPURE
+
+-int yychar; /* the lookahead symbol */
+-YYSTYPE yylval; /* the semantic value of the */
+- /* lookahead symbol */
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced. |
+`------------------------------------------------*/
-+
+
+-#ifdef YYLSP_NEEDED
+-YYLTYPE yylloc; /* location data for the lookahead */
+- /* symbol */
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
@@ -8843,13 +8921,20 @@
+ YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+ YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
-+
+
+-int yynerrs; /* number of parse errors so far */
+-#endif /* not YYPURE */
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (Rule); \
+} while (0)
-+
+
+-#if YYDEBUG != 0
+-int yydebug; /* nonzero means print parse trace */
+-/* Since this is uninitialized, it does not stop multiple parsers
+- from coexisting. */
+-#endif
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
+int yydebug;
@@ -8893,11 +8978,12 @@
- should be passed with type unsigned int, because that is what the non-GCC
- definitions require. With GCC, __builtin_memcpy takes an arg
- of type size_t, but it can handle unsigned int. */
--
+
-#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
-#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
-#else /* not GNU C or C++ */
-#ifndef __cplusplus
++#if YYERROR_VERBOSE
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
@@ -8906,12 +8992,6 @@
- char *to;
- char *from;
- unsigned int count;
--{
-- register char *f = from;
-- register char *t = to;
-- register int i = count;
-+#if YYERROR_VERBOSE
-+
+# ifndef yystrlen
+# if defined (__GLIBC__) && defined (_STRING_H)
+# define yystrlen strlen
@@ -8924,17 +9004,23 @@
+yystrlen (yystr)
+ const char *yystr;
+# endif
-+{
+ {
+- register char *f = from;
+- register char *t = to;
+- register int i = count;
+ register const char *yys = yystr;
-+
+
+- while (i-- > 0)
+- *t++ = *f++;
+ while (*yys++ != '\0')
+ continue;
+
+ return yys - yystr - 1;
-+}
+ }
+# endif
+# endif
-+
+
+-#else /* __cplusplus */
+# ifndef yystpcpy
+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+# define yystpcpy stpcpy
@@ -8953,28 +9039,25 @@
+ register char *yyd = yydest;
+ register const char *yys = yysrc;
-- while (i-- > 0)
-- *t++ = *f++;
+-/* This is the most reliable way to avoid incompatibilities
+- in available built-in functions on various systems. */
+ while ((*yyd++ = *yys++) != '\0')
+ continue;
+
+ return yyd - 1;
- }
++}
+# endif
+# endif
+
+#endif /* !YYERROR_VERBOSE */
-
--#else /* __cplusplus */
++
+
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
-
--/* This is the most reliable way to avoid incompatibilities
-- in available built-in functions on various systems. */
++
+#if defined (__STDC__) || defined (__cplusplus)
static void
-__yy_memcpy (char *to, char *from, unsigned int count)
@@ -9210,7 +9293,8 @@
- have just been pushed. so pushing a state here evens the stacks. */
-yynewstate:
+ goto yysetstate;
-+
+
+- *++yyssp = yystate;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate. |
+`------------------------------------------------------------*/
@@ -9220,13 +9304,8 @@
+ */
+ yyssp++;
-- *++yyssp = yystate;
-+ yysetstate:
-+ *yyssp = yystate;
-
- if (yyssp >= yyss + yystacksize - 1)
-+ if (yyss + yystacksize - 1 <= yyssp)
- {
+- {
- /* Give user a chance to reallocate the stack */
- /* Use copies of these so that the &'s don't force the real ones into memory. */
- YYSTYPE *yyvs1 = yyvs;
@@ -9234,7 +9313,11 @@
-#ifdef YYLSP_NEEDED
- YYLTYPE *yyls1 = yyls;
-#endif
--
++ yysetstate:
++ *yyssp = yystate;
+
++ if (yyss + yystacksize - 1 <= yyssp)
++ {
/* Get the current used size of the three stacks, in elements. */
- int size = yyssp - yyss + 1;
+ YYSIZE_T yysize = yyssp - yyss + 1;
@@ -9262,8 +9345,12 @@
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ short *yyss1 = yyss;
+
+- yyss = yyss1; yyvs = yyvs1;
+-#ifdef YYLSP_NEEDED
+- yyls = yyls1;
+-#endif
+
-+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
@@ -9271,11 +9358,7 @@
+ yyoverflow ("parser stack overflow",
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
-
-- yyss = yyss1; yyvs = yyvs1;
--#ifdef YYLSP_NEEDED
-- yyls = yyls1;
--#endif
++
+ &yystacksize);
+
+ yyss = yyss1;
@@ -9503,9 +9586,9 @@
if (yyn == 0)
goto yyerrlab;
+ goto yyreduce;
-+
-/* Do a reduction. yyn is the number of a rule to reduce with. */
++
+/*-----------------------------.
+| yyreduce -- Do a reduction. |
+`-----------------------------*/
@@ -9514,15 +9597,23 @@
yylen = yyr2[yyn];
- if (yylen > 0)
- yyval = yyvsp[1-yylen]; /* implement default value of the action */
--
+
-#if YYDEBUG != 0
- if (yydebug)
- {
- int i;
--
++ /* If YYLEN is nonzero, implement the default value of the action:
++ `$$ = $1'.
+
- fprintf (stderr, "Reducing via rule %d (line %d), ",
- yyn, yyrline[yyn]);
--
++ Otherwise, the following line sets YYVAL to garbage.
++ This behavior is undocumented and Bison
++ users should not rely upon it. Assigning to YYVAL
++ unconditionally makes the parser a bit smaller, and it avoids a
++ GCC warning that YYVAL may be used uninitialized. */
++ yyval = yyvsp[1-yylen];
+
- /* Print the symbols being reduced, and their result. */
- for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
- fprintf (stderr, "%s ", yytname[yyrhs[i]]);
@@ -9530,18 +9621,6 @@
- }
-#endif
-+ /* If YYLEN is nonzero, implement the default value of the action:
-+ `$$ = $1'.
-
-- switch (yyn) {
-+ Otherwise, the following line sets YYVAL to garbage.
-+ This behavior is undocumented and Bison
-+ users should not rely upon it. Assigning to YYVAL
-+ unconditionally makes the parser a bit smaller, and it avoids a
-+ GCC warning that YYVAL may be used uninitialized. */
-+ yyval = yyvsp[1-yylen];
-+
-+
+ YY_REDUCE_PRINT (yyn);
+ switch (yyn)
+ {
@@ -9549,7 +9628,8 @@
+#line 217 "vcc.y"
+ { addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;}
+ break;
-+
+
+- switch (yyn) {
+ case 5:
+#line 220 "vcc.y"
+ { addList(&vObjList, yyvsp[0].vobj); curObj = 0; ;}
@@ -9948,7 +10028,11 @@
- int size = 0;
- char *msg;
- int x, count;
--
++ YYSIZE_T yysize = 0;
++ int yytype = YYTRANSLATE (yychar);
++ char *yymsg;
++ int yyx, yycount;
+
- count = 0;
- /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
- for (x = (yyn < 0 ? -yyn : 0);
@@ -9957,11 +10041,6 @@
- size += strlen(yytname[x]) + 15, count++;
- msg = (char *) malloc(size + 15);
- if (msg != 0)
-+ YYSIZE_T yysize = 0;
-+ int yytype = YYTRANSLATE (yychar);
-+ char *yymsg;
-+ int yyx, yycount;
-+
+ yycount = 0;
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
@@ -10177,18 +10256,7 @@
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
--#endif
-- }
-- return 0;
-
-- yyabortlab:
-- /* YYABORT comes here. */
-- if (yyfree_stacks)
-- {
-- free (yyss);
-- free (yyvs);
--#ifdef YYLSP_NEEDED
-- free (yyls);
++
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here. |
+`-------------------------------------*/
@@ -10211,8 +10279,18 @@
+ yyerror ("parser stack overflow");
+ yyresult = 2;
+ /* Fall through. */
-+#endif
-+
+ #endif
+- }
+- return 0;
+
+- yyabortlab:
+- /* YYABORT comes here. */
+- if (yyfree_stacks)
+- {
+- free (yyss);
+- free (yyvs);
+-#ifdef YYLSP_NEEDED
+- free (yyls);
+yyreturn:
+#ifndef yyoverflow
+ if (yyss != yyssa)
@@ -10240,7 +10318,7 @@
RCS file: /home/kde/kdepim/libkcal/versit/vcc.y,v
retrieving revision 1.3
retrieving revision 1.3.8.1
-diff -u -r1.3 -r1.3.8.1
+diff -u -d -r1.3 -r1.3.8.1
--- libkcal/versit/vcc.y 11 Jul 2003 21:03:14 -0000 1.3
+++ libkcal/versit/vcc.y 13 Dec 2004 01:56:50 -0000 1.3.8.1
@@ -147,6 +147,10 @@
@@ -10259,7 +10337,7 @@
RCS file: /home/kde/kdepim/libkdenetwork/Attic/kpgp.cpp,v
retrieving revision 1.68
retrieving revision 1.68.2.1
-diff -u -r1.68 -r1.68.2.1
+diff -u -d -r1.68 -r1.68.2.1
--- libkdenetwork/kpgp.cpp 28 Jun 2004 17:33:27 -0000 1.68
+++ libkdenetwork/kpgp.cpp 10 Feb 2005 13:42:23 -0000 1.68.2.1
@@ -110,7 +110,10 @@
@@ -10288,7 +10366,7 @@
RCS file: /home/kde/kdepim/libkdepim/addresseelineedit.cpp,v
retrieving revision 1.24.2.6
retrieving revision 1.24.2.9
-diff -u -r1.24.2.6 -r1.24.2.9
+diff -u -d -r1.24.2.6 -r1.24.2.9
--- libkdepim/addresseelineedit.cpp 24 Nov 2004 11:11:11 -0000 1.24.2.6
+++ libkdepim/addresseelineedit.cpp 30 Nov 2004 10:47:35 -0000 1.24.2.9
@@ -86,6 +86,7 @@
@@ -10508,7 +10586,7 @@
RCS file: /home/kde/kdepim/libkdepim/addresseelineedit.h,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.5
-diff -u -r1.14.2.2 -r1.14.2.5
+diff -u -d -r1.14.2.2 -r1.14.2.5
--- libkdepim/addresseelineedit.h 28 Oct 2004 20:15:59 -0000 1.14.2.2
+++ libkdepim/addresseelineedit.h 30 Nov 2004 10:47:35 -0000 1.14.2.5
@@ -93,7 +93,7 @@
@@ -10540,7 +10618,7 @@
RCS file: /home/kde/kdepim/libkdepim/addresseeview.cpp,v
retrieving revision 1.47
retrieving revision 1.47.2.1
-diff -u -r1.47 -r1.47.2.1
+diff -u -d -r1.47 -r1.47.2.1
--- libkdepim/addresseeview.cpp 20 Jul 2004 19:27:08 -0000 1.47
+++ libkdepim/addresseeview.cpp 29 Nov 2004 15:05:05 -0000 1.47.2.1
@@ -638,8 +638,8 @@
@@ -10559,7 +10637,7 @@
RCS file: /home/kde/kdepim/libkdepim/completionordereditor.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
-diff -u -r1.1.2.2 -r1.1.2.3
+diff -u -d -r1.1.2.2 -r1.1.2.3
--- libkdepim/completionordereditor.cpp 28 Sep 2004 17:16:27 -0000 1.1.2.2
+++ libkdepim/completionordereditor.cpp 28 Dec 2004 19:54:14 -0000 1.1.2.3
@@ -74,17 +74,6 @@
@@ -10585,7 +10663,7 @@
RCS file: /home/kde/kdepim/libkdepim/completionordereditor.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
-diff -u -r1.1 -r1.1.2.1
+diff -u -d -r1.1 -r1.1.2.1
--- libkdepim/completionordereditor.h 4 Jun 2004 23:54:52 -0000 1.1
+++ libkdepim/completionordereditor.h 28 Dec 2004 19:54:14 -0000 1.1.2.1
@@ -38,8 +38,20 @@
@@ -10615,7 +10693,7 @@
RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposerconfig.desktop,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
-diff -u -r1.25.2.1 -r1.25.2.2
+diff -u -d -r1.25.2.1 -r1.25.2.2
--- libkdepim/komposer/core/komposerconfig.desktop 24 Aug 2004 06:32:56 -0000 1.25.2.1
+++ libkdepim/komposer/core/komposerconfig.desktop 26 Jan 2005 08:10:33 -0000 1.25.2.2
@@ -25,6 +25,7 @@
@@ -10631,7 +10709,7 @@
RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposereditor.desktop,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.10
-diff -u -r1.20.2.8 -r1.20.2.10
+diff -u -d -r1.20.2.8 -r1.20.2.10
--- libkdepim/komposer/core/komposereditor.desktop 13 Nov 2004 07:20:59 -0000 1.20.2.8
+++ libkdepim/komposer/core/komposereditor.desktop 10 Jan 2005 09:02:04 -0000 1.20.2.10
@@ -4,7 +4,9 @@
@@ -10649,7 +10727,7 @@
RCS file: /home/kde/kdepim/libkdepim/komposer/core/komposerplugin.desktop,v
retrieving revision 1.38.2.5
retrieving revision 1.38.2.6
-diff -u -r1.38.2.5 -r1.38.2.6
+diff -u -d -r1.38.2.5 -r1.38.2.6
--- libkdepim/komposer/core/komposerplugin.desktop 28 Nov 2004 08:34:05 -0000 1.38.2.5
+++ libkdepim/komposer/core/komposerplugin.desktop 29 Dec 2004 21:45:12 -0000 1.38.2.6
@@ -2,6 +2,7 @@
@@ -10665,7 +10743,7 @@
RCS file: /home/kde/kdepim/libkdepim/komposer/plugins/krichtext/Attic/krichtextplugin.desktop,v
retrieving revision 1.50.2.9
retrieving revision 1.50.2.10
-diff -u -r1.50.2.9 -r1.50.2.10
+diff -u -d -r1.50.2.9 -r1.50.2.10
--- libkdepim/komposer/plugins/krichtext/krichtextplugin.desktop 28 Nov 2004 08:34:05 -0000 1.50.2.9
+++ libkdepim/komposer/plugins/krichtext/krichtextplugin.desktop 5 Jan 2005 07:50:34 -0000 1.50.2.10
@@ -17,6 +17,7 @@
@@ -10689,7 +10767,7 @@
RCS file: /home/kde/kdepim/plugins/kmail/bodypartformatter/text_calendar.desktop,v
retrieving revision 1.20.2.7
retrieving revision 1.20.2.8
-diff -u -r1.20.2.7 -r1.20.2.8
+diff -u -d -r1.20.2.7 -r1.20.2.8
--- plugins/kmail/bodypartformatter/text_calendar.desktop 13 Nov 2004 07:21:00 -0000 1.20.2.7
+++ plugins/kmail/bodypartformatter/text_calendar.desktop 29 Dec 2004 21:45:13 -0000 1.20.2.8
@@ -1,6 +1,7 @@
@@ -10713,7 +10791,7 @@
RCS file: /home/kde/kdepim/plugins/kmail/bodypartformatter/text_vcard.desktop,v
retrieving revision 1.20.2.8
retrieving revision 1.20.2.9
-diff -u -r1.20.2.8 -r1.20.2.9
+diff -u -d -r1.20.2.8 -r1.20.2.9
--- plugins/kmail/bodypartformatter/text_vcard.desktop 13 Nov 2004 07:21:00 -0000 1.20.2.8
+++ plugins/kmail/bodypartformatter/text_vcard.desktop 29 Dec 2004 21:45:13 -0000 1.20.2.9
@@ -1,6 +1,7 @@