[Pkg-kde-commits] rev 1182 - in branches/kde-3.4.0/packages/kdepim/debian: . man patches
Daniel Schepler
schepler@costa.debian.org
Fri, 03 Jun 2005 05:41:47 +0000
Author: schepler
Date: 2005-06-03 05:41:44 +0000 (Fri, 03 Jun 2005)
New Revision: 1182
Added:
branches/kde-3.4.0/packages/kdepim/debian/kdepim-kresources.install
branches/kde-3.4.0/packages/kdepim/debian/libkdepim1-dev.install
branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050601.diff
Removed:
branches/kde-3.4.0/packages/kdepim/debian/man/korganizerIn.man
branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff
Modified:
branches/kde-3.4.0/packages/kdepim/debian/changelog
branches/kde-3.4.0/packages/kdepim/debian/control
branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install
branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
branches/kde-3.4.0/packages/kdepim/debian/kmail.install
branches/kde-3.4.0/packages/kdepim/debian/knotes.install
branches/kde-3.4.0/packages/kdepim/debian/korganizer.install
branches/kde-3.4.0/packages/kdepim/debian/korganizer.manpages
branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install
branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install
branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install
branches/kde-3.4.0/packages/kdepim/debian/rules
Log:
kdepim 3.4.1-1 packaging
Modified: branches/kde-3.4.0/packages/kdepim/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/changelog 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/changelog 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,3 +1,12 @@
+kdepim (4:3.4.1-1) experimental; urgency=low
+
+ * New upstream release.
+ * Split kresources into new package kdepim-kresources.
+ * Split kdepimmacros.h into new package libkdepim1-dev, and make all
+ the other -dev packages depend on it.
+
+ -- Daniel Schepler <schepler@debian.org> Thu, 2 Jun 2005 21:45:31 -0700
+
kdepim (4:3.4.0-0pre1) alioth; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdepim/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/control 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/control 2005-06-03 05:41:44 UTC (rev 1182)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Daniel Schepler <schepler@debian.org>
-Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.0), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, sharutils, texinfo
+Build-Depends: autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.1), libbluetooth1-dev, libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline4-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
Build-Conflicts: libgnokii2-dev, libgnokii2
Standards-Version: 3.6.1.0
@@ -11,7 +11,7 @@
Package: kdepim
Section: kde
Architecture: all
-Depends: akregator (>= ${Source-Version}), 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}), networkstatus (>= ${Source-Version}), libkcal2a (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1a (>= ${Source-Version})
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${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}), networkstatus (>= ${Source-Version}), libkcal2a (>= ${Source-Version}), libkdepim1 (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${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
@@ -23,9 +23,9 @@
Package: kdepim-dev
Section: devel
Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-wizards (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkdepim1 (= ${Source-Version}), libkpimidentities1 (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kdepim-wizards (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra0-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
Conflicts: libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0)
-Replaces: kmail (<< 4:3.2.0), knotes (<< 4:3.0.0), korganizer (<< 4:3.2.0), libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0)
+Replaces: kmail (<< 4:3.2.0), knotes (<< 4:3.0.0), korganizer (<< 4:3.2.0), libkdenetwork1 (<< 4:3.0.0), libkdenetwork2-dev (<< 4:3.2.0), libkcal2-dev (<< 4:3.4.1)
Description: KDE Personal Information Management [development]
This package contains development files needed to compile kdepim applications.
.
@@ -68,6 +68,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Replaces: kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0)
+Suggests: kdepim-kresources
Description: KDE NG addressbook application
KAddressBook is the main address book application for KDE; it enables you
to manage your contacts efficiently and comfortably. It can load and save
@@ -142,6 +143,20 @@
.
This package is part of the official KDE pim module.
+Package: kdepim-kresources
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libkcal2a (<< 4:3.4.1), kaddressbook (<< 4:3.4.1), knotes (<< 4:3.4.1)
+Recommends: ${shlibs:Recommends}, korganizer
+Suggests: knotes
+Description: KDE pim resource plugins
+ This package includes several plugins needed to interface with groupware
+ servers. It also includes plugins for features such as blogging and
+ tracking feature plans.
+ .
+ This package is part of the official KDE pim module.
+
Package: kdepim-wizards
Section: kde
Architecture: any
@@ -225,6 +240,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Replaces: kontact (<< 4:3.2.92)
+Suggests: kdepim-kresources
Description: KDE sticky notes
KNotes is a program that lets you write sticky notes. The notes are saved
automatically when you exit the program, and they display when you open the
@@ -299,7 +315,7 @@
Package: korn
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, kdepim-kio-plugins | kdebase-kio-plugins
Description: KDE mail checker
Korn is a KDE mail checker that can display a small summary in the Kicker
tray. It supports checking mbox, pop3, imap4, and nntp sources.
@@ -363,6 +379,7 @@
Depends: ${shlibs:Depends}
Conflicts: kdepim-libs (<< 4:3.2.0), libkcal2
Replaces: kdepim-libs (<< 4:3.2.0)
+Suggests: kdepim-kresources
Description: KDE calendaring library
This library provides a C++ API for handling the vCalendar and iCalendar
formats.
@@ -374,7 +391,7 @@
Package: libkcal2-dev
Section: libdevel
Architecture: any
-Depends: libkcal2a (= ${Source-Version})
+Depends: libkcal2a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version})
Conflicts: kdepim-libs (<< 4:3.0.0)
Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
Description: KDE calendaring library [development]
@@ -397,6 +414,17 @@
.
This package is part of the official KDE pim module.
+Package: libkdepim1-dev
+Section: libdevel
+Architecture: any
+Depends: libkdepim1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.4.1)
+Replaces: kdepim-dev (<< 4:3.4.1)
+Description: KDE PIM library [development]
+ This is the development package which contains the headers for the libkdepim
+ library.
+ .
+ This package is part of the official KDE pim module.
+
Package: libkgantt0
Section: libs
Architecture: any
@@ -411,7 +439,7 @@
Package: libkgantt0-dev
Section: libdevel
Architecture: any
-Depends: libkgantt0 (= ${Source-Version})
+Depends: libkgantt0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
Conflicts: kdepim-libs (<< 4:3.0.0)
Replaces: kdepim-dev (<< 4:3.2.0), kdepim-libs (<< 4:3.0.0)
Description: KDE gantt charting library [development]
@@ -437,7 +465,7 @@
Package: libkleopatra0-dev
Section: libdevel
Architecture: any
-Depends: libkleopatra0a (= ${Source-Version})
+Depends: libkleopatra0a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
Description: KDE GnuPG interface libraries [development]
This library is used by several KDE applications to interface to the
GnuPG program.
@@ -462,7 +490,7 @@
Package: libkpimexchange1-dev
Section: libdevel
Architecture: any
-Depends: libkpimexchange1 (= ${Source-Version})
+Depends: libkpimexchange1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
Replaces: kdepim-dev (<< 4:3.2.0)
Description: KDE PIM Exchange library [development]
This is the development package which contains the headers for the
@@ -495,7 +523,7 @@
Package: libksieve0-dev
Section: libdevel
Architecture: any
-Depends: libksieve0 (= ${Source-Version})
+Depends: libksieve0 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
Description: KDE mail/news message filtering library [development]
This is the development package which contains the headers for the libksieve
library.
@@ -520,7 +548,7 @@
Package: libktnef1-dev
Section: libdevel
Architecture: any
-Depends: libktnef1 (= ${Source-Version})
+Depends: libktnef1 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
Replaces: kdepim-dev (<< 4:3.4.0)
Description: KTNEF handler library [development]
This library handles mail attachments using the TNEF format. These
@@ -548,7 +576,7 @@
Package: libmimelib1-dev
Section: libdevel
Architecture: any
-Depends: libmimelib1a (= ${Source-Version})
+Depends: libmimelib1a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
Conflicts: libmimelib-dev (<< 4:3.0.0)
Replaces: libmimelib-dev (<< 4:3.0.0)
Description: KDE mime library [development]
Modified: branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,17 +1,5 @@
/usr/bin/kabc2mutt
/usr/bin/kaddressbook
-/usr/lib/kde3/kabc_groupdav.la
-/usr/lib/kde3/kabc_groupdav.so
-/usr/lib/kde3/kabc_groupwise.la
-/usr/lib/kde3/kabc_groupwise.so
-/usr/lib/kde3/kabc_kolab.la
-/usr/lib/kde3/kabc_kolab.so
-/usr/lib/kde3/kabc_newexchange.la
-/usr/lib/kde3/kabc_newexchange.so
-/usr/lib/kde3/kabc_slox.la
-/usr/lib/kde3/kabc_slox.so
-/usr/lib/kde3/kabc_xmlrpc.la
-/usr/lib/kde3/kabc_xmlrpc.so
/usr/lib/kde3/kcm_kabconfig.la
/usr/lib/kde3/kcm_kabconfig.so
/usr/lib/kde3/kcm_kabcustomfields.la
@@ -24,18 +12,6 @@
/usr/lib/kde3/libkaddrbk_*.so
/usr/lib/kde3/libkaddressbookpart.la
/usr/lib/kde3/libkaddressbookpart.so
-/usr/lib/libkabckolab.so.0
-/usr/lib/libkabckolab.so.0.0.0
-/usr/lib/libkabc_groupdav.so.1
-/usr/lib/libkabc_groupdav.so.1.0.0
-/usr/lib/libkabc_groupwise.so.1
-/usr/lib/libkabc_groupwise.so.1.0.0
-/usr/lib/libkabc_newexchange.so.1
-/usr/lib/libkabc_newexchange.so.1.0.0
-/usr/lib/libkabc_slox.so.0
-/usr/lib/libkabc_slox.so.0.0.0
-/usr/lib/libkabc_xmlrpc.so.1
-/usr/lib/libkabc_xmlrpc.so.1.0.0
/usr/lib/libkabinterfaces.so.1
/usr/lib/libkabinterfaces.so.1.0.0
/usr/lib/libkaddressbook.so.0
@@ -52,7 +28,7 @@
/usr/share/services/kabcustomfields.desktop
/usr/share/services/kabldapconfig.desktop
/usr/share/services/kaddressbook
-/usr/share/services/kresources/kabc
+/usr/share/services/kresources/kabc/imap.desktop
/usr/share/services/ldifvcardthumbnail.desktop
/usr/share/servicetypes/dcopaddressbook.desktop
/usr/share/servicetypes/kaddressbook_contacteditorwidget.desktop
Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -3,7 +3,6 @@
/usr/include/kde/kabc
/usr/include/kde/calendar
/usr/include/kde/kaddressbook
-/usr/include/kde/kdepimmacros.h
/usr/include/kde/kitchensync
/usr/include/kde/kmail
/usr/include/kde/kmailIface.h
@@ -35,8 +34,26 @@
/usr/lib/libkabinterfaces.so
/usr/lib/libkaddressbook.la
/usr/lib/libkaddressbook.so
-/usr/lib/libkdepim.la
-/usr/lib/libkdepim.so
+/usr/lib/libkcalkolab.la
+/usr/lib/libkcalkolab.so
+/usr/lib/libkcal_blogging.la
+/usr/lib/libkcal_blogging.so
+/usr/lib/libkcal_groupdav.la
+/usr/lib/libkcal_groupdav.so
+/usr/lib/libkcal_groupwise.la
+/usr/lib/libkcal_groupwise.so
+/usr/lib/libkcal_newexchange.la
+/usr/lib/libkcal_newexchange.so
+/usr/lib/libkcal_resourcefeatureplan.la
+/usr/lib/libkcal_resourcefeatureplan.so
+/usr/lib/libkcal_slox.la
+/usr/lib/libkcal_slox.so
+/usr/lib/libkcal_xmlrpc.la
+/usr/lib/libkcal_xmlrpc.so
+/usr/lib/libkgroupwarebase.la
+/usr/lib/libkgroupwarebase.so
+/usr/lib/libkgroupwaredav.la
+/usr/lib/libkgroupwaredav.so
/usr/lib/libkitchensyncui.la
/usr/lib/libkitchensyncui.so
/usr/lib/libknoteskolab.la
@@ -63,6 +80,8 @@
/usr/lib/libkpimidentities.so
/usr/lib/libkpinterfaces.la
/usr/lib/libkpinterfaces.so
+/usr/lib/libkslox.la
+/usr/lib/libkslox.so
/usr/lib/libksync.la
/usr/lib/libksync.so
/usr/lib/libksync2.la
Added: branches/kde-3.4.0/packages/kdepim/debian/kdepim-kresources.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-kresources.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-kresources.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -0,0 +1,79 @@
+/usr/lib/kde3/kabc_*.la
+/usr/lib/kde3/kabc_*.so
+/usr/lib/kde3/kcal_blogging.la
+/usr/lib/kde3/kcal_blogging.so
+/usr/lib/kde3/kcal_groupdav.la
+/usr/lib/kde3/kcal_groupdav.so
+/usr/lib/kde3/kcal_groupwise.la
+/usr/lib/kde3/kcal_groupwise.so
+/usr/lib/kde3/kcal_kolab.la
+/usr/lib/kde3/kcal_kolab.so
+/usr/lib/kde3/kcal_newexchange.la
+/usr/lib/kde3/kcal_newexchange.so
+/usr/lib/kde3/kcal_resourcefeatureplan.la
+/usr/lib/kde3/kcal_resourcefeatureplan.so
+/usr/lib/kde3/kcal_slox.la
+/usr/lib/kde3/kcal_slox.so
+/usr/lib/kde3/kcal_xmlrpc.la
+/usr/lib/kde3/kcal_xmlrpc.so
+/usr/lib/kde3/knotes_kolab.la
+/usr/lib/kde3/knotes_kolab.so
+/usr/lib/kde3/knotes_xmlrpc.la
+/usr/lib/kde3/knotes_xmlrpc.so
+/usr/lib/libkabckolab.so.0
+/usr/lib/libkabckolab.so.0.0.0
+/usr/lib/libkabc_groupdav.so.1
+/usr/lib/libkabc_groupdav.so.1.0.0
+/usr/lib/libkabc_groupwise.so.1
+/usr/lib/libkabc_groupwise.so.1.0.0
+/usr/lib/libkabc_newexchange.so.1
+/usr/lib/libkabc_newexchange.so.1.0.0
+/usr/lib/libkabc_slox.so.0
+/usr/lib/libkabc_slox.so.0.0.0
+/usr/lib/libkabc_xmlrpc.so.1
+/usr/lib/libkabc_xmlrpc.so.1.0.0
+/usr/lib/libkcalkolab.so.0
+/usr/lib/libkcalkolab.so.0.0.0
+/usr/lib/libkcal_blogging.so.1
+/usr/lib/libkcal_blogging.so.1.0.0
+/usr/lib/libkcal_groupdav.so.1
+/usr/lib/libkcal_groupdav.so.1.0.0
+/usr/lib/libkcal_groupwise.so.1
+/usr/lib/libkcal_groupwise.so.1.0.0
+/usr/lib/libkcal_newexchange.so.1
+/usr/lib/libkcal_newexchange.so.1.0.0
+/usr/lib/libkcal_resourcefeatureplan.so.1
+/usr/lib/libkcal_resourcefeatureplan.so.1.0.0
+/usr/lib/libkcal_slox.so.0
+/usr/lib/libkcal_slox.so.0.0.0
+/usr/lib/libkcal_xmlrpc.so.1
+/usr/lib/libkcal_xmlrpc.so.1.0.0
+/usr/lib/libkgroupwarebase.so.0
+/usr/lib/libkgroupwarebase.so.0.0.0
+/usr/lib/libkgroupwaredav.so.0
+/usr/lib/libkgroupwaredav.so.0.0.0
+/usr/lib/libknoteskolab.so.0
+/usr/lib/libknoteskolab.so.0.0.0
+/usr/lib/libknotes_xmlrpc.so.1
+/usr/lib/libknotes_xmlrpc.so.1.0.0
+/usr/lib/libkslox.so.0
+/usr/lib/libkslox.so.0.0.0
+/usr/share/services/kresources/kabc/kabc_groupdav.desktop
+/usr/share/services/kresources/kabc/kabc_groupwise.desktop
+/usr/share/services/kresources/kabc/kabc_newexchange.desktop
+/usr/share/services/kresources/kabc/kabc_opengroupware.desktop
+/usr/share/services/kresources/kabc/kabc_slox.desktop
+/usr/share/services/kresources/kabc/kabc_xmlrpc.desktop
+/usr/share/services/kresources/kabc/kolab.desktop
+/usr/share/services/kresources/kcal/blogging.desktop
+/usr/share/services/kresources/kcal/exchange.desktop
+/usr/share/services/kresources/kcal/kcal_groupdav.desktop
+/usr/share/services/kresources/kcal/kcal_groupwise.desktop
+/usr/share/services/kresources/kcal/kcal_newexchange.desktop
+/usr/share/services/kresources/kcal/kcal_opengroupware.desktop
+/usr/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop
+/usr/share/services/kresources/kcal/kcal_slox.desktop
+/usr/share/services/kresources/kcal/kcal_xmlrpc.desktop
+/usr/share/services/kresources/kcal/kolab.desktop
+/usr/share/services/kresources/knotes/knotes_xmlrpc.desktop
+/usr/share/services/kresources/knotes/kolabresource.desktop
Modified: branches/kde-3.4.0/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kmail.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/kmail.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -30,6 +30,7 @@
/usr/share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
/usr/share/apps/kconf_update/kmail-3.3b1-misc.pl
/usr/share/apps/kconf_update/kmail-3.4-misc.pl
+/usr/share/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
/usr/share/apps/kconf_update/kmail-pgpidentity.pl
/usr/share/apps/kconf_update/kmail-upd-identities.pl
/usr/share/apps/kconf_update/kmail.upd
Modified: branches/kde-3.4.0/packages/kdepim/debian/knotes.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/knotes.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/knotes.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,14 +1,6 @@
/usr/bin/knotes
-/usr/lib/kde3/knotes_kolab.la
-/usr/lib/kde3/knotes_kolab.so
/usr/lib/kde3/knotes_local.la
/usr/lib/kde3/knotes_local.so
-/usr/lib/kde3/knotes_xmlrpc.la
-/usr/lib/kde3/knotes_xmlrpc.so
-/usr/lib/libknoteskolab.so.0
-/usr/lib/libknoteskolab.so.0.0.0
-/usr/lib/libknotes_xmlrpc.so.1
-/usr/lib/libknotes_xmlrpc.so.1.0.0
/usr/share/applications/kde/knotes.desktop
/usr/share/apps/knotes
/usr/share/config.kcfg/knoteconfig.kcfg
@@ -20,7 +12,8 @@
/usr/share/icons/crystalsvg/32x32/apps/knotes.png
/usr/share/icons/crystalsvg/48x48/apps/knotes.png
/usr/share/icons/crystalsvg/64x64/apps/knotes.png
-/usr/share/services/kresources/knotes
+/usr/share/services/kresources/knotes/imap.desktop
+/usr/share/services/kresources/knotes/local.desktop
/usr/share/services/kresources/knotes_manager.desktop
../icons/knotes.xpm /usr/share/pixmaps
../icons/knotes-16.xpm /usr/share/pixmaps
Modified: branches/kde-3.4.0/packages/kdepim/debian/korganizer.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/korganizer.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/korganizer.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,7 +1,6 @@
/usr/bin/ical2vcal
/usr/bin/korgac
/usr/bin/korganizer
-/usr/bin/korganizerIn
/usr/lib/kde3/kcm_korganizer.la
/usr/lib/kde3/kcm_korganizer.so
/usr/lib/kde3/libkorg_*.la
Modified: branches/kde-3.4.0/packages/kdepim/debian/korganizer.manpages
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/korganizer.manpages 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/korganizer.manpages 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,4 +1,3 @@
debian/man/out/ical2vcal.1
debian/man/out/korgac.1
debian/man/out/korganizer.1
-debian/man/out/korganizerIn.1
Modified: branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,29 +1,7 @@
/usr/include/kde/libkcal
/usr/lib/libkcal.la
/usr/lib/libkcal.so
-/usr/lib/libkcalkolab.la
-/usr/lib/libkcalkolab.so
-/usr/lib/libkcal_blogging.la
-/usr/lib/libkcal_blogging.so
-/usr/lib/libkcal_groupdav.la
-/usr/lib/libkcal_groupdav.so
-/usr/lib/libkcal_groupwise.la
-/usr/lib/libkcal_groupwise.so
-/usr/lib/libkcal_newexchange.la
-/usr/lib/libkcal_newexchange.so
-/usr/lib/libkcal_resourcefeatureplan.la
-/usr/lib/libkcal_resourcefeatureplan.so
/usr/lib/libkcal_resourceremote.la
/usr/lib/libkcal_resourceremote.so
-/usr/lib/libkcal_slox.la
-/usr/lib/libkcal_slox.so
-/usr/lib/libkcal_xmlrpc.la
-/usr/lib/libkcal_xmlrpc.so
-/usr/lib/libkgroupwarebase.la
-/usr/lib/libkgroupwarebase.so
-/usr/lib/libkgroupwaredav.la
-/usr/lib/libkgroupwaredav.so
/usr/lib/libkholidays.la
/usr/lib/libkholidays.so
-/usr/lib/libkslox.la
-/usr/lib/libkslox.so
Modified: branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,33 +1,21 @@
-/usr/lib/kde3/kcal_*.la
-/usr/lib/kde3/kcal_*.so
+/usr/lib/kde3/kcal_kabc.la
+/usr/lib/kde3/kcal_kabc.so
+/usr/lib/kde3/kcal_localdir.la
+/usr/lib/kde3/kcal_localdir.so
+/usr/lib/kde3/kcal_local.la
+/usr/lib/kde3/kcal_local.so
+/usr/lib/kde3/kcal_remote.la
+/usr/lib/kde3/kcal_remote.so
/usr/lib/libkcal.so.2
/usr/lib/libkcal.so.2.0.0
-/usr/lib/libkcalkolab.so.0
-/usr/lib/libkcalkolab.so.0.0.0
-/usr/lib/libkcal_blogging.so.1
-/usr/lib/libkcal_blogging.so.1.0.0
-/usr/lib/libkcal_groupdav.so.1
-/usr/lib/libkcal_groupdav.so.1.0.0
-/usr/lib/libkcal_groupwise.so.1
-/usr/lib/libkcal_groupwise.so.1.0.0
-/usr/lib/libkcal_newexchange.so.1
-/usr/lib/libkcal_newexchange.so.1.0.0
-/usr/lib/libkcal_resourcefeatureplan.so.1
-/usr/lib/libkcal_resourcefeatureplan.so.1.0.0
/usr/lib/libkcal_resourceremote.so.1
/usr/lib/libkcal_resourceremote.so.1.0.0
-/usr/lib/libkcal_slox.so.0
-/usr/lib/libkcal_slox.so.0.0.0
-/usr/lib/libkcal_xmlrpc.so.1
-/usr/lib/libkcal_xmlrpc.so.1.0.0
-/usr/lib/libkgroupwarebase.so.0
-/usr/lib/libkgroupwarebase.so.0.0.0
-/usr/lib/libkgroupwaredav.so.0
-/usr/lib/libkgroupwaredav.so.0.0.0
/usr/lib/libkholidays.so.1
/usr/lib/libkholidays.so.1.0.0
-/usr/lib/libkslox.so.0
-/usr/lib/libkslox.so.0.0.0
/usr/share/apps/libkholidays
-/usr/share/services/kresources/kcal
+/usr/share/services/kresources/kcal/imap.desktop
+/usr/share/services/kresources/kcal/kabc.desktop
+/usr/share/services/kresources/kcal/local.desktop
+/usr/share/services/kresources/kcal/localdir.desktop
+/usr/share/services/kresources/kcal/remote.desktop
/usr/share/services/kresources/kcal_manager.desktop
Added: branches/kde-3.4.0/packages/kdepim/debian/libkdepim1-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkdepim1-dev.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkdepim1-dev.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -0,0 +1,3 @@
+/usr/include/kde/kdepimmacros.h
+/usr/lib/libkdepim.la
+/usr/lib/libkdepim.so
Modified: branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install 2005-06-03 05:41:44 UTC (rev 1182)
@@ -1,6 +1,6 @@
/etc/kde3/libkleopatrarc
/usr/lib/libgpgme++.so.0
-/usr/lib/libgpgme++.so.0.1.0
+/usr/lib/libgpgme++.so.0.2.0
/usr/lib/libkleopatra.so.0
/usr/lib/libkleopatra.so.0.0.0
/usr/lib/libkpgp.so.2
Deleted: branches/kde-3.4.0/packages/kdepim/debian/man/korganizerIn.man
Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff
Copied: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050601.diff (from rev 1178, branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff)
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff 2005-06-02 14:57:20 UTC (rev 1178)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050601.diff 2005-06-03 05:41:44 UTC (rev 1182)
@@ -0,0 +1,1307 @@
+Index: kmobile/libkmobile.desktop
+===================================================================
+--- kmobile/libkmobile.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/libkmobile.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -20,6 +20,7 @@
+ Name[is]=Hrár KDE vélbúnaðarrekill fyrir farsíma og lófatölvur
+ Name[it]=KDE driver hardware di basso livello per dispositivi portatili
+ Name[ja]=KDE 携帯機器低レベルハードウェアドライバ
++Name[lt]=KDE mobiliųjų įrenginių žemo lygmens aparatinės įrangos tvarkyklė
+ Name[nb]=KDE lavnivå maskinvaredriver for mobile enheter
+ Name[nl]=Hardware-stuurprogramma voor mobiele apparaten
+ Name[nn]=Lågnivå maskinvaredrivar for mobileiningar i KDE
+Index: kmobile/devices/gnokii/libkmobile_gnokii.desktop
+===================================================================
+--- kmobile/devices/gnokii/libkmobile_gnokii.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/devices/gnokii/libkmobile_gnokii.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -21,6 +21,7 @@
+ Name[is]=Farsími eða lófatölva (gnokii)
+ Name[it]=Telefono cellulare o organizer (gnokii)
+ Name[ja]=携帯電話又はオーガナイザ (gnokii)
++Name[lt]=Mobilus telefonas ar asmeninės info tvarkyklė (gnokii)
+ Name[nb]=Mobiltelefon eller PDA (gnokii)
+ Name[nl]=Mobiele telefoon of Organizer (gnokii)
+ Name[nn]=Mobiltelefon eller organisator (gnokii)
+@@ -58,6 +59,7 @@
+ Comment[is]=Þessi rekill styður marga farsíma frá NOKIA og fleiri gegnum gnokii aðgerðasafnið
+ Comment[it]=Questo driver supporta molti NOKIA e altri telefoni cellulari tramite la libreria gnokii
+ Comment[ja]=本ドライバは gnokii ライブラリ経由で多種の NOKIA 並びに他社製の携帯電話 をサポートします。
++Comment[lt]=Ši tvarkyklė palaiko daugelį NOKIA ir kitų telefonų pasinaudodama gnokii biblioteka
+ Comment[nb]=Denne driveren støtter mange NOKIA og andre mobiltelefoner via gnokii-biblioteket
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gnokii-bibliotheek
+ Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gnokii-biblioteket
+Index: kmobile/devices/gammu/libkmobile_gammu.desktop
+===================================================================
+--- kmobile/devices/gammu/libkmobile_gammu.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/devices/gammu/libkmobile_gammu.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -21,6 +21,7 @@
+ Name[is]=Farsími eða lófatölva (gammu)
+ Name[it]=Organizer o telefono cellulare (gammu)
+ Name[ja]=携帯電話又はオーガナイザ (gammu)
++Name[lt]=Mobilus telefonas ar asmeninės info tvarkyklė (gammu)
+ Name[nb]=Mobiltelefon eller PDA (gammu)
+ Name[nl]=Mobiele telefoon of Organizer (gammu)
+ Name[nn]=Mobiltelefon eller organisator (gammu)
+@@ -58,6 +59,7 @@
+ Comment[is]=Þessi rekill styður marga NOKIA og aðra farsíma gegnum gammu aðgerðasafnið
+ Comment[it]=Questo driver supporta molti NOKIA e altri telefoni cellulari tramite la libreria gammu.
+ Comment[ja]=本ドライバは gammu ライブラリ経由で多種の NOKIA 並びに他社製の携帯電話 をサポートします。
++Comment[lt]=Ši tvarkyklė palaiko daugelį NOKIA ir kitų telefonų pasinaudodama gammu biblioteka
+ Comment[nb]=Denne driveren støtter mange NOKIA og andre mobiltelefoner via gammu-biblioteket
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel Nokia- en andere mobiele telefoons via de gammu-bibliotheek
+ Comment[nn]=Denne drivaren støttar mange NOKIA og andre mobiltelefonar via gammu-biblioteket
+Index: kmobile/devices/digicam/libkmobile_digicam.desktop
+===================================================================
+--- kmobile/devices/digicam/libkmobile_digicam.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/devices/digicam/libkmobile_digicam.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -66,6 +66,7 @@
+ Comment[is]=Þessi rekill styður margar stafrænar myndavélar
+ Comment[it]=Questo driver supporta molte fotocamere digitali
+ Comment[ja]=本ドライバは多種のデジタルカメラのサポートを提供します。
++Comment[lt]=Ši tvarkyklė palaiko daugelį skaitmeninių kamerų
+ Comment[nb]=Denne driveren støtter mange digitalkameraer
+ Comment[nl]=Dit stuurprogramma biedt ondersteuning voor veel camera's
+ Comment[nn]=Denne drivaren støttar mange digitale kamera
+Index: kmobile/kmobile.desktop
+===================================================================
+--- kmobile/kmobile.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/kmobile.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -33,6 +33,7 @@
+ GenericName[is]=Sýsla með lófatölvur og farsíma
+ GenericName[it]=Gestisce dispositivi portatili
+ GenericName[ja]=携帯機器の管理
++GenericName[lt]=Mobiliųjų įrenginių tvarkymas
+ GenericName[nb]=Håndtere mobile enheter
+ GenericName[nl]=Mobiele apparaten beheren
+ GenericName[nn]=Handtera mobileiningar
+@@ -73,6 +74,7 @@
+ Comment[is]=KDE stjórnforrit fyrir lófatölvur og farsíma
+ Comment[it]=Un gestore di dispositivi portatili di KDE
+ Comment[ja]=KDE 携帯機器マネージャ
++Comment[lt]=KDE mobiliųjų įrenginių tvarkyklė
+ Comment[nb]=En KDE-håndterer for mobile enheter
+ Comment[nl]=Beheer van mobiele apparaten in KDE
+ Comment[nn]=Ein einingshandterar for mobiltelefon i KDE
+Index: kmobile/kioslave/mimetypes/mobile_addressbook.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_addressbook.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/kioslave/mimetypes/mobile_addressbook.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -20,6 +20,7 @@
+ Comment[is]=Tengiliðir í farsíma eða lófatölvu
+ Comment[it]=Contatti nel dispositivo portatile
+ Comment[ja]=携帯機器内のコンタクト
++Comment[lt]=Kontaktai mobiliajame įrenginyje
+ Comment[nb]=Kontaktliste i mobil enhet
+ Comment[nl]=Contactpersonen in mobiel apparaat
+ Comment[nn]=Kontaktar i mobileiningar
+Index: kmobile/kioslave/mimetypes/mobile_notes.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_notes.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/kioslave/mimetypes/mobile_notes.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -20,6 +20,7 @@
+ Comment[is]=Áminningar í farsíma eða lófatölvu
+ Comment[it]=Note nel dispositivo portatile
+ Comment[ja]=携帯機器内のノート
++Comment[lt]=Užrašai mobiliajame įrenginyje
+ Comment[nb]=Notater i mobil enhet
+ Comment[nl]=Notities in mobiel apparaat
+ Comment[nn]=Notat i mobileiningar
+Index: kmobile/kioslave/mimetypes/mobile_calendar.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_calendar.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/kioslave/mimetypes/mobile_calendar.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -20,6 +20,7 @@
+ Comment[is]=Dagatal í farsíma eða lófatölvu
+ Comment[it]=Calendari nel dispositivo portatile
+ Comment[ja]=携帯機器内のカレンダー
++Comment[lt]=Kalendorius mobiliajame įrenginyje
+ Comment[nb]=Kalender i mobil enhet
+ Comment[nl]=Agenda in mobiel apparaat
+ Comment[nn]=Kalender i mobileiningar
+Index: kmobile/kioslave/mimetypes/mobile_device.desktop
+===================================================================
+--- kmobile/kioslave/mimetypes/mobile_device.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmobile/kioslave/mimetypes/mobile_device.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -21,6 +21,7 @@
+ Comment[is]=Farsími eða lófatölva
+ Comment[it]=Dispositivo portatile
+ Comment[ja]=モバイルデバイス
++Comment[lt]=Mobilusis įrenginys
+ Comment[nb]=Mobil enhet
+ Comment[nl]=Mobiel apparaat
+ Comment[nn]=Mobileining
+Index: kresources/exchange/exchange_deprecated.desktop
+===================================================================
+--- kresources/exchange/exchange_deprecated.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kresources/exchange/exchange_deprecated.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -14,6 +14,7 @@
+ Name[hu]=Exchange 2000-kiszolgáló (elavult)
+ Name[is]=Exchange 2000 þjónn (úrelt)
+ Name[it]=Server Exchange 2000 (deprecato)
++Name[lt]=Exchange 2000 serveris (deprecated)
+ Name[nl]=Exchange 2000-server (afgeraden)
+ Name[pl]=Serwer Exchange 2000 (przestarzałe)
+ Name[pt]=Servidor Exchange 2000 (depreciado)
+Index: kresources/groupdav/kabc_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kabc_groupdav.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kresources/groupdav/kabc_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -14,6 +14,7 @@
+ Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware)
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
++Name[lt]=GroupDAV serveris (pvz.: OpenGroupware)
+ Name[nl]=GroupDAV-server (OpenGroupware)
+ Name[pl]=Serwer GroupDAV (np. OpenGroupware)
+ Name[pt]=Servidor GroupDAV (por exemplo OpenGroupware)
+Index: kresources/groupdav/kcal_groupdav.desktop
+===================================================================
+--- kresources/groupdav/kcal_groupdav.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kresources/groupdav/kcal_groupdav.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -14,6 +14,7 @@
+ Name[hu]=GroupDAV-kiszolgáló (pl. OpenGroupware)
+ Name[is]=GroupDAV þjónn (t.d. OpenGroupware)
+ Name[it]=Server GroupDAV (per es. OpenGroupware)
++Name[lt]=GroupDAV serveris (pvz.: OpenGroupware)
+ Name[nl]=GroupDAV-server (OpenGroupware)
+ Name[pl]=Serwer GroupDAV (np. OpenGroupware)
+ Name[pt]=Servidor GroupDAV (por exemplo OpenGroupware)
+Index: kmail/dcopimap.desktop
+===================================================================
+--- kmail/dcopimap.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/dcopimap.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -22,6 +22,7 @@
+ Comment[is]=Póstforrit með DCOP viðmóti
+ Comment[it]=Programma di posta con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェース付のメールプログラム
++Comment[lt]=Pašto programa su DCOP sąsaja
+ Comment[nb]=E-postprogram med DCOP grensesnitt
+ Comment[nl]=E-mailprogramma met een DCOP-interface
+ Comment[nn]=E-postprogram med eit DCOP-grensesnitt
+Index: kmail/profiles/profile-high-contrast-rc.desktop
+===================================================================
+--- kmail/profiles/profile-high-contrast-rc.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/profiles/profile-high-contrast-rc.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -22,6 +22,7 @@
+ Name[is]=Mikil birtuskil
+ Name[it]=Alto contrasto
+ Name[ja]=ハイコントラスト
++Name[lt]=Didelis kontrastas
+ Name[nb]=Høy kontrast
+ Name[nl]=Hoog contrast
+ Name[nn]=Høg kontrast
+Index: kmail/profiles/profile-secure-rc.desktop
+===================================================================
+--- kmail/profiles/profile-secure-rc.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/profiles/profile-secure-rc.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -21,6 +21,7 @@
+ Name[is]=Öruggast
+ Name[it]=Massima sicurezza
+ Name[ja]=最も安全
++Name[lt]=Saugiausias
+ Name[nb]=Sikrest
+ Name[nl]=Meest veilig
+ Name[nn]=Tryggast
+@@ -62,6 +63,7 @@
+ Comment[is]=Setur allar stillingar þannig að öryggið sé mest
+ Comment[it]=Imposta tutte le opzioni necessario per ottenere la massima sicurezza
+ Comment[ja]=最大のセキュリティ確保のために必要な全てのオプションをセットします
++Comment[lt]=Nustato visas būtinas maksimaliam saugumui parinktis
+ Comment[nb]=Setter opp alle nødvendige innstillinger for å oppnå høyeste sikkerhet
+ Comment[nl]=Stelt alle benodigde opties in voor maximale veiligheid
+ Comment[nn]=Set alle nødvendige innstillingar for maksimal tryggleik
+Index: kmail/kmail_config_misc.desktop
+===================================================================
+--- kmail/kmail_config_misc.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/kmail_config_misc.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -36,6 +36,7 @@
+ Name[is]=Ýmislegt
+ Name[it]=Varie
+ Name[ja]=そのほか
++Name[lt]=Įvairūs
+ Name[nb]=Div
+ Name[nl]=Diversen
+ Name[nn]=Ymse
+@@ -114,6 +115,7 @@
+ Keywords[is]=kmail,ýmislegt
+ Keywords[it]=kmail,varie
+ Keywords[ja]=kmail,そのほか
++Keywords[lt]=kmail,misc,įvairūs
+ Keywords[nb]=kmail,div
+ Keywords[nl]=kmail,diversen
+ Keywords[nn]=KMail,ymse
+Index: kmail/kmail_config_composer.desktop
+===================================================================
+--- kmail/kmail_config_composer.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/kmail_config_composer.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -32,6 +32,7 @@
+ Name[hi]=कम्पोज़र
+ Name[hu]=Szerkesztő
+ Name[it]=Compositore
++Name[lt]=Redaktorius
+ Name[nb]=Komposer
+ Name[nl]=Opsteller
+ Name[nn]=Skrivefelt
+@@ -70,6 +71,7 @@
+ Comment[is]=Setningar & almenn hegðun
+ Comment[it]=Frasi e comportamento generale
+ Comment[ja]=言いまわし & 一般的な振る舞い
++Comment[lt]=Frazės ir bendroji elgsena
+ Comment[nb]=Fraser & generell oppførsel
+ Comment[nl]=Zinnen & Algemeen gedrag
+ Comment[nn]=Frasar og generell åtferd
+@@ -106,6 +108,7 @@
+ Keywords[hu]=kmail,szerkesztő
+ Keywords[is]=kmail,composer,ritill
+ Keywords[it]=kmail,compositore
++Keywords[lt]=kmail,composer,redaktorius
+ Keywords[nb]=kmail,komposer
+ Keywords[nl]=kmail,opsteller
+ Keywords[nn]=KMail,skrivefelt
+Index: kmail/configuredialog_p.h
+===================================================================
+--- kmail/configuredialog_p.h (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/configuredialog_p.h (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -513,6 +513,7 @@
+ virtual void doLoadFromGlobalSettings();
+ virtual void doLoadOther();
+ //FIXME virtual void doResetToDefaultsOther();
++ void readCurrentFallbackCodec();
+ void readCurrentOverrideCodec();
+
+ private: // data
+Index: kmail/kmail_config_identity.desktop
+===================================================================
+--- kmail/kmail_config_identity.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/kmail_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -35,6 +35,7 @@
+ Name[is]=Auðkenni
+ Name[it]=Identità
+ Name[ja]=身元
++Name[lt]=Tapatybės
+ Name[nb]=Identiteter
+ Name[nl]=Identiteiten
+ Name[nn]=Identitetar
+@@ -75,6 +76,7 @@
+ Comment[is]=Stjórna auðkennum
+ Comment[it]=Gestisce le identità
+ Comment[ja]=身元管理
++Comment[lt]=Tvarkyti tapatybes
+ Comment[nb]=Identitet behandling
+ Comment[nl]=Identiteiten beheren
+ Comment[nn]=Handter identitetar
+@@ -115,6 +117,7 @@
+ Keywords[is]=kmail,auðkenni
+ Keywords[it]=kmail,identità
+ Keywords[ja]=kmail,身元
++Keywords[lt]=kmail,identity,tapatybė
+ Keywords[nb]=kmail,identitet
+ Keywords[nl]=kmail,identiteit
+ Keywords[nn]=KMail,identitet
+Index: kmail/eventsrc
+===================================================================
+--- kmail/eventsrc (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/eventsrc (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -27,6 +27,7 @@
+ Name[is]=Nýr póstur
+ Name[it]=Nuova posta arrivata
+ Name[ja]=新規メール着信
++Name[lt]=Atėjo naujas paštas
+ Name[nb]=Ny e-post ankommet
+ Name[nl]=Nieuwe berichten gearriveerd
+ Name[nn]=Ny e-post er komen
+@@ -67,6 +68,7 @@
+ Comment[is]=Nýr póstur
+ Comment[it]=Nuova posta
+ Comment[ja]=新規メール着信
++Comment[lt]=Atėjo naujas paštas
+ Comment[nb]=Ny e-post ankommet
+ Comment[nl]=Nieuw bericht ontvangen
+ Comment[nn]=Ny e-post er komen
+Index: kmail/configuredialog.cpp
+===================================================================
+--- kmail/configuredialog.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/configuredialog.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -2190,22 +2190,8 @@
+ // Fallback Character Encoding
+ QHBoxLayout *hlay = new QHBoxLayout( vlay ); // inherits spacing
+ mCharsetCombo = new QComboBox( this );
+- const QStringList &encodings = KMMsgBase::supportedEncodings( false );
+- mCharsetCombo->insertStringList( encodings );
++ mCharsetCombo->insertStringList( KMMsgBase::supportedEncodings( false ) );
+
+- QStringList::ConstIterator it( encodings.begin() );
+- QStringList::ConstIterator end( encodings.end() );
+- const QString ¤tEncoding = GlobalSettings::fallbackCharacterEncoding();
+- int i = 0;
+- for( ; it != end; ++it)
+- {
+- if( KGlobal::charsets()->encodingForName(*it) == currentEncoding )
+- {
+- mCharsetCombo->setCurrentItem( i );
+- break;
+- }
+- i++;
+- }
+ connect( mCharsetCombo, SIGNAL( activated( int ) ),
+ this, SLOT( slotEmitChanged( void ) ) );
+
+@@ -2222,7 +2208,10 @@
+ // Override Character Encoding
+ QHBoxLayout *hlay2 = new QHBoxLayout( vlay ); // inherits spacing
+ mOverrideCharsetCombo = new QComboBox( this );
+- readCurrentOverrideCodec();
++ QStringList encodings = KMMsgBase::supportedEncodings( false );
++ encodings.prepend( i18n( "Auto" ) );
++ mOverrideCharsetCombo->insertStringList( encodings );
++ mOverrideCharsetCombo->setCurrentItem(0);
+
+ connect( mOverrideCharsetCombo, SIGNAL( activated( int ) ),
+ this, SLOT( slotEmitChanged( void ) ) );
+@@ -2241,16 +2230,35 @@
+ }
+
+
++void AppearancePage::ReaderTab::readCurrentFallbackCodec()
++{
++ QStringList encodings = KMMsgBase::supportedEncodings( false );
++ QStringList::ConstIterator it( encodings.begin() );
++ QStringList::ConstIterator end( encodings.end() );
++ const QString ¤tEncoding = GlobalSettings::fallbackCharacterEncoding();
++ int i = 0;
++ for( ; it != end; ++it)
++ {
++ if( KGlobal::charsets()->encodingForName(*it) == currentEncoding )
++ {
++ mCharsetCombo->setCurrentItem( i );
++ break;
++ }
++ i++;
++ }
++}
++
+ void AppearancePage::ReaderTab::readCurrentOverrideCodec()
+ {
++ const QString ¤tOverrideEncoding = GlobalSettings::overrideCharacterEncoding();
++ if ( currentOverrideEncoding.isEmpty() ) {
++ mOverrideCharsetCombo->setCurrentItem( 0 );
++ return;
++ }
+ QStringList encodings = KMMsgBase::supportedEncodings( false );
+ encodings.prepend( i18n( "Auto" ) );
+- mOverrideCharsetCombo->insertStringList( encodings );
+- mOverrideCharsetCombo->setCurrentItem(0);
+-
+ QStringList::Iterator it( encodings.begin() );
+ QStringList::Iterator end( encodings.end() );
+- const QString ¤tOverrideEncoding = GlobalSettings::overrideCharacterEncoding();
+ int i = 0;
+ for( ; it != end; ++it)
+ {
+@@ -2266,6 +2274,7 @@
+ void AppearancePage::ReaderTab::doLoadFromGlobalSettings()
+ {
+ mShowEmoticonsCheck->setChecked( GlobalSettings::showEmoticons() );
++ readCurrentFallbackCodec();
+ readCurrentOverrideCodec();
+ }
+
+@@ -2285,7 +2294,9 @@
+ GlobalSettings::setFallbackCharacterEncoding(
+ KGlobal::charsets()->encodingForName( mCharsetCombo->currentText() ) );
+ GlobalSettings::setOverrideCharacterEncoding(
+- KGlobal::charsets()->encodingForName( mOverrideCharsetCombo->currentText() ) );
++ mOverrideCharsetCombo->currentItem() == 0 ?
++ QString() :
++ KGlobal::charsets()->encodingForName( mOverrideCharsetCombo->currentText() ) );
+ }
+
+
+Index: kmail/kmail_config_appearance.desktop
+===================================================================
+--- kmail/kmail_config_appearance.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/kmail_config_appearance.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -119,6 +119,7 @@
+ Keywords[is]=kmail,útlit
+ Keywords[it]=kmail,aspetto
+ Keywords[ja]=kmail,外観
++Keywords[lt]=kmail,appearance,išvaizda
+ Keywords[nb]=kmail,utseende
+ Keywords[nl]=kmail,uiterlijk
+ Keywords[nn]=KMail,utsjånad
+Index: kmail/dcopmail.desktop
+===================================================================
+--- kmail/dcopmail.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/dcopmail.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -22,6 +22,7 @@
+ Comment[is]=Póstforrit með DCOP viðmóti
+ Comment[it]=Programma di posta con un'interfaccia DCOP
+ Comment[ja]=DCOP インターフェース付のメールプログラム
++Comment[lt]=Pašto programa su DCOP sąsaja
+ Comment[nb]=E-postprogram med DCOP grensesnitt
+ Comment[nl]=E-mailprogramma met een DCOP-interface
+ Comment[nn]=E-postprogram med eit DCOP-grensesnitt
+Index: kmail/kmail_config_security.desktop
+===================================================================
+--- kmail/kmail_config_security.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/kmail_config_security.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -36,6 +36,7 @@
+ Name[is]=Öryggi
+ Name[it]=Sicurezza
+ Name[ja]=セキュリティ
++Name[lt]=Saugumas
+ Name[nb]=Sikkerhet
+ Name[nl]=Beveiliging
+ Name[nn]=Tryggleik
+@@ -77,6 +78,7 @@
+ Comment[is]=Öryggis & einkalífsstillingar
+ Comment[it]=Impostazioni sicurezza e privacy
+ Comment[ja]=セキュリティ & プライバシーの設定
++Comment[lt]=Saugumo ir privatumo nustatymai
+ Comment[nb]=Sikkerhet & Personvern instillinger
+ Comment[nl]=Beveiligings- en privacy-instellingen
+ Comment[nn]=Innstillingar for tryggleik og personvern
+@@ -117,6 +119,7 @@
+ Keywords[is]=kmail,öryggi
+ Keywords[it]=kmail,sicurezza
+ Keywords[ja]=kmail,セキュリティ
++Keywords[lt]=kmail,security,saugumas
+ Keywords[nb]=kmail,sikkerhet
+ Keywords[nl]=kmail,beveiliging
+ Keywords[nn]=KMail,tryggleik
+Index: kmail/kmail_config_accounts.desktop
+===================================================================
+--- kmail/kmail_config_accounts.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kmail/kmail_config_accounts.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -73,6 +73,7 @@
+ Comment[is]=Uppsetning fyrir sendingu og móttöku af tölvupósti
+ Comment[it]=Impostazioni per spedire e ricevere messaggi
+ Comment[ja]=メッセージを送受信する為の設定
++Comment[lt]=Laiškų siuntimo ir gavimo sąranka
+ Comment[nb]=Oppset for mottak og sending av meldinger
+ Comment[nl]=Instellingen voor het verzenden en ontvangen van berichten
+ Comment[nn]=Oppsett av sending og mottak av meldingar
+@@ -108,6 +109,7 @@
+ Keywords[hu]=kmail,azonosítók
+ Keywords[is]=kmail,accounts,tengingar
+ Keywords[it]=kmail,account
++Keywords[lt]=kmail,accounts,paskyros
+ Keywords[nn]=KMail,kontoar
+ Keywords[pl]=kmail,konta
+ Keywords[pt]=kmail,contas
+Index: knode/knarticlefactory.cpp
+===================================================================
+--- knode/knarticlefactory.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ knode/knarticlefactory.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -118,7 +118,7 @@
+
+ //create new article
+ QString sig;
+- KNLocalArticle *art=newArticle(g, sig, chset);
++ KNLocalArticle *art=newArticle(g, sig, chset, true, a);
+ if(!art)
+ return;
+
+@@ -786,7 +786,7 @@
+ }
+
+
+-KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, QString &sig, QCString defChset, bool withXHeaders)
++KNLocalArticle* KNArticleFactory::newArticle(KNCollection *col, QString &sig, QCString defChset, bool withXHeaders, KNArticle *origPost)
+ {
+ KNConfig::PostNewsTechnical *pnt=knGlobals.configManager()->postNewsTechnical();
+
+@@ -883,12 +883,18 @@
+ if(withXHeaders) {
+ KNConfig::XHeaders::Iterator it;
+ for(it=pnt->xHeaders().begin(); it!=pnt->xHeaders().end(); ++it) {
+- QString name(art->from()->name());
+- if (name.isEmpty())
+- name = QString::fromLatin1(art->from()->email());
+ QString value = (*it).value();
+- value.replace(QRegExp("%NAME"), name);
+- value.replace(QRegExp("%EMAIL"), QString::fromLatin1(art->from()->email()));
++ if(origPost) {
++ QString name(origPost->from()->name());
++ if (name.isEmpty())
++ name = QString::fromLatin1(origPost->from()->email());
++ value.replace(QRegExp("%NAME"), name);
++ value.replace(QRegExp("%EMAIL"), QString::fromLatin1(origPost->from()->email()));
++ }
++ else
++ if(value.find("%NAME") != -1 || value.find("%EMAIL") != -1)
++ continue;
++
+ art->setHeader( new KMime::Headers::Generic( (QCString("X-")+(*it).name()), art, value, pnt->charset() ) );
+ }
+ }
+Index: knode/knode_config_identity.desktop
+===================================================================
+--- knode/knode_config_identity.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ knode/knode_config_identity.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -34,6 +34,7 @@
+ Name[is]=Auðkenni
+ Name[it]=Identità
+ Name[ja]=身元
++Name[lt]=Tapatybė
+ Name[nb]=Identitet
+ Name[nl]=Identiteit
+ Name[nn]=Identitet
+Index: knode/knode_config_accounts.desktop
+===================================================================
+--- knode/knode_config_accounts.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ knode/knode_config_accounts.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -73,6 +73,7 @@
+ Comment[is]=Uppsetning fyrir fréttahópa og póstþjóna
+ Comment[it]=Impostazioni per newsgroup e server di posta
+ Comment[ja]=ニュースグループとメールサーバの設定
++Comment[lt]=Naujienų grupių ir pašto serverių nustatymai
+ Comment[nb]=Oppsett av nyhetsgruppe- og e-post tjenere
+ Comment[nl]=Instellingen voor nieuws- en mailservers
+ Comment[nn]=Oppsett av Usenet- og e-post-tenarar
+Index: knode/knode_config_cleanup.desktop
+===================================================================
+--- knode/knode_config_cleanup.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ knode/knode_config_cleanup.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -30,6 +30,7 @@
+ Name[is]=Hreinsun
+ Name[it]=Pulizia
+ Name[ja]=クリーンナップ
++Name[lt]=Išvalymas
+ Name[nb]=Rydd opp
+ Name[nl]=Opschoning
+ Name[nn]=Rydd opp
+@@ -66,6 +67,7 @@
+ Comment[is]=Varðveita diskpláss
+ Comment[it]=Risparmia lo spazio su disco
+ Comment[ja]=ディスク・スペースの保存
++Comment[lt]=Disko erdvės išsaugojimas
+ Comment[nb]=Bevarer disk plass
+ Comment[nl]=Besparing van schrijfruimte
+ Comment[nn]=Frigjer diskplass
+Index: knode/knnntpclient.cpp
+===================================================================
+--- knode/knnntpclient.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ knode/knnntpclient.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -398,7 +398,7 @@
+ // see RFC 2980 section 2.1.7
+ QStrList headerformat;
+ cmd = "LIST OVERVIEW.FMT";
+- if (sendCommand( cmd, rep )) {
++ if ( sendCommand( cmd, rep ) && rep == 215 ) {
+ QStrList tmp;
+ if (getMsg(tmp)) {
+ for(QCString s = tmp.first(); s; s = tmp.next()) {
+Index: knode/knarticlefactory.h
+===================================================================
+--- knode/knarticlefactory.h (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ knode/knarticlefactory.h (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -78,7 +78,7 @@
+
+ //article generation
+ // col: group or account
+- KNLocalArticle* newArticle(KNCollection *col, QString &sig, QCString defChset, bool withXHeaders=true);
++ KNLocalArticle* newArticle(KNCollection *col, QString &sig, QCString defChset, bool withXHeaders=true, KNArticle *origPost=0);
+
+ //cancel & supersede
+ bool cancelAllowed(KNArticle *a);
+Index: kalarm/alarmevent.cpp
+===================================================================
+--- kalarm/alarmevent.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kalarm/alarmevent.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -842,6 +842,7 @@
+ checkRecur(); // ensure recurrence/repetition data is consistent
+ bool readOnly = ev.isReadOnly();
+ ev.setReadOnly(false);
++ ev.setTransparency(Event::Transparent);
+
+ // Set up event-specific data
+ QStringList cats;
+Index: kalarm/messagewin.cpp
+===================================================================
+--- kalarm/messagewin.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kalarm/messagewin.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -78,6 +78,7 @@
+ #ifndef WITHOUT_ARTS
+ static const char* KMIX_APP_NAME = "kmix";
+ static const char* KMIX_DCOP_OBJECT = "Mixer0";
++static const char* KMIX_DCOP_WINDOW = "kmix-mainwindow#1";
+ #endif
+
+ // The delay for enabling message window buttons if a zero delay is
+@@ -955,6 +956,10 @@
+ // KMix is not already running, so start it
+ if (KApplication::startServiceByDesktopName(QString::fromLatin1(KMIX_APP_NAME), QString::null, &mKMixError, &mKMixName))
+ return false;
++ // Minimise its window - don't use hide() since this would remove all
++ // trace of it from the panel if it is not configured to be docked in
++ // the system tray.
++ kapp->dcopClient()->send(mKMixName, KMIX_DCOP_WINDOW, "minimize()", QString::null);
+ }
+ return true;
+ }
+Index: kalarm/mainwindowbase.h
+===================================================================
+--- kalarm/mainwindowbase.h (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kalarm/mainwindowbase.h (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -24,6 +24,13 @@
+ #include <kmainwindow.h>
+
+
++/**
++ * The MainWindowBase class is a base class for KAlarm's main window and message window.
++ * When the window is closed, it only allows the application to quit if there is no
++ * system tray icon displayed.
++ *
++ * @author David Jarvie <software@astrojar.org.uk>
++ */
+ class MainWindowBase : public KMainWindow
+ {
+ Q_OBJECT
+Index: Makefile.cvs
+===================================================================
+--- Makefile.cvs (.../tags/KDE/3.4.1/kdepim) (revision 0)
++++ Makefile.cvs (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -0,0 +1,16 @@
++
++all:
++ @echo "This Makefile is only for the CVS repository"
++ @echo "This will be deleted before making the distribution"
++ @echo ""
++ @if test ! -d admin; then \
++ echo "Please recheckout this module!" ;\
++ echo "for cvs: use checkout once and after that update again" ;\
++ echo "for cvsup: checkout kde-common from cvsup and" ;\
++ echo " link kde-common/admin to ./admin" ;\
++ exit 1 ;\
++ fi
++ $(MAKE) -f admin/Makefile.common cvs
++
++.SILENT:
++
+
+Property changes on: Makefile.cvs
+___________________________________________________________________
+Name: svn:keywords
+ + Author Date Id Revision
+
+Index: kaddressbook/xxport/vcard_xxport.desktop
+===================================================================
+--- kaddressbook/xxport/vcard_xxport.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kaddressbook/xxport/vcard_xxport.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -58,6 +58,7 @@
+ Comment[is]=Íforrit til að flytja inn eða út tengiliði í vCard sniði
+ Comment[it]=Plugin per importare ed esportare contatti in formato vCard
+ Comment[ja]=vCard フォーマットによるコンタクトのインポート及びエクスポートプラグイン
++Comment[lt]=Įskiepis kontaktų importavimui ir eksportavimui vCard formatu
+ Comment[nb]=Tilleggsprogram for import og eksport av kontakter i vCard-format
+ Comment[nl]=Plugin voor het importeren en exporteren van contactpersonen in vCard-formaat
+ Comment[nn]=Programtillegg for å importera og eksportera kontaktar i vCard-format
+Index: plugins/kmail/bodypartformatter/text_calendar.cpp
+===================================================================
+--- plugins/kmail/bodypartformatter/text_calendar.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ plugins/kmail/bodypartformatter/text_calendar.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -254,8 +254,8 @@
+ // First, save it for KOrganizer to handle
+ QString dir;
+ if ( status == Attendee::Accepted ) dir = "accepted";
+- else if ( status == Attendee::Tentative ) dir = "accepted";
+- else if ( status == Attendee::Declined ) dir = "tentative";
++ else if ( status == Attendee::Tentative ) dir = "tentative";
++ else if ( status == Attendee::Declined ) dir = "cancel";
+ else return true; // unknown status
+
+ saveFile( receiver, iCal, dir );
+Index: kitchensync/multisynk/multisynk.desktop
+===================================================================
+--- kitchensync/multisynk/multisynk.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kitchensync/multisynk/multisynk.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -19,6 +19,7 @@
+ GenericName[hu]=Szinkronizáció
+ GenericName[is]=Samstilling
+ GenericName[it]=Sincronizzazione
++GenericName[lt]=Sinchronizacija
+ GenericName[nl]=Synchronisatie
+ GenericName[nn]=Synkronisering
+ GenericName[pl]=Synchronizacja
+Index: kitchensync/kitchensync/debugger/debugger.desktop
+===================================================================
+--- kitchensync/kitchensync/debugger/debugger.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kitchensync/kitchensync/debugger/debugger.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -18,6 +18,7 @@
+ Name[hu]=Konnector nyomkövető
+ Name[is]=Konnector aflúsun
+ Name[ja]=Konnector デバッガ
++Name[lt]=Konnector išriktuotojas
+ Name[ms]=Nyah-ralat Konnector
+ Name[nb]=Konnector feilfinner
+ Name[nl]=Konnector-debugger
+Index: kitchensync/kitchensync/viewer/viewer.desktop
+===================================================================
+--- kitchensync/kitchensync/viewer/viewer.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kitchensync/kitchensync/viewer/viewer.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -18,6 +18,7 @@
+ Name[is]=Gagnaskoðari
+ Name[it]=Vista dati
+ Name[ja]=データ ビューア
++Name[lt]=Duomenų žiūryklė
+ Name[nb]=Datavisning
+ Name[nl]=Gegevensweergave
+ Name[nn]=Datavising
+Index: kitchensync/kitchensync/backup/restore.desktop
+===================================================================
+--- kitchensync/kitchensync/backup/restore.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kitchensync/kitchensync/backup/restore.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -17,6 +17,7 @@
+ Name[is]=Konnector endurheimtun
+ Name[it]=Ripristina Konnector
+ Name[ja]=Konnector 回復
++Name[lt]=Konnector atstatymas
+ Name[nb]=Konnector gjenoppretting
+ Name[nl]=Konnector-herstel
+ Name[nn]=Konnector-gjenoppretting
+Index: kitchensync/kitchensync/backup/backup.desktop
+===================================================================
+--- kitchensync/kitchensync/backup/backup.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kitchensync/kitchensync/backup/backup.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -18,6 +18,7 @@
+ Name[hu]=Konnector biztonsági mentés
+ Name[is]=Konnector afritun
+ Name[ja]=Konnector バックアップ
++Name[lt]=Konnector atsarginės kopijos
+ Name[nb]=Konnector sikkerhetskopiering
+ Name[nl]=Konnector-reservekopie
+ Name[nn]=Konnector tryggingskopi
+Index: kitchensync/libkonnector2/filter.desktop
+===================================================================
+--- kitchensync/libkonnector2/filter.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kitchensync/libkonnector2/filter.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -15,6 +15,7 @@
+ Comment[hu]=Szűrő a KitchenSync-csatolóhoz
+ Comment[is]=Sía fyrir KitchenSync Konnector
+ Comment[it]=Filtro per il Konnector KitchenSync
++Comment[lt]=Filtras, skirtas KitchenSync Konnector
+ Comment[nl]=Filter voor KitchenSync Konnector
+ Comment[pl]=Filtr dla Konnectora KitchenSync
+ Comment[pt]=Filtro para o Conector KitchenSync
+Index: configure.in.in
+===================================================================
+--- configure.in.in (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ configure.in.in (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -1,8 +1,13 @@
+ #MIN_CONFIG(3.3)
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h)
+
++dnl Checks for header files.
++AC_CHECK_HEADERS([fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h])
++AC_CHECK_HEADERS([unistd.h values.h sys/limits.h err.h sys/cdefs.h sysent.h])
++AC_CHECK_HEADERS([sys/file.h sys/stat.h sys/cdefs.h strings.h paths.h])
++AC_CHECK_HEADERS([getopt.h byteswap.h])
++
+ AC_CHECK_SETENV
+ AC_CHECK_UNSETENV
+
+@@ -57,15 +62,6 @@
+ dnl the below is copied from kdenetwork's configure as too many apps moved
+ dnl and noone can say which tests are needed and which are obsolete for kdepim ;(
+
+-dnl Checks for header files.
+-AC_CHECK_HEADERS(linux/tcp.h linux/if_ppp.h)
+-AC_CHECK_HEADERS(net/errno.h net/if_ppp.h)
+-AC_CHECK_HEADERS(asm/param.h)
+-AC_CHECK_HEADERS(sys/file.h sys/stat.h sys/time.h sys/cdefs.h sys/sockio.h)
+-AC_CHECK_HEADERS(fcntl.h unistd.h fnmatch.h sysent.h strings.h paths.h)
+-AC_CHECK_HEADERS(utmp.h re_comp.h getopt.h byteswap.h)
+-AC_CHECK_HEADER([resolv.h],,,[#include <netinet/in.h>])
+-
+ KDE_CHECK_LARGEFILE
+
+ AC_CHECK_FUNCS(flock)
+Index: kpilot/conduits/notepadconduit/notepad-conduit.desktop
+===================================================================
+--- kpilot/conduits/notepadconduit/notepad-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/notepadconduit/notepad-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -32,6 +32,7 @@
+ Comment[hu]=Bővítőmodul NotePad-rajzok helyi könyvtárba való lementéséhez.
+ Comment[is]=Þessi rás afritar NotePad teikningar í staðbundna möppu.
+ Comment[it]=Questo conduit archivia i disegni NotePad drawings in una cartella locale.
++Comment[lt]=Šis kanalas padaro NotePad piešinių atsargines kopijas į vietinį aplanką.
+ Comment[nl]=Dit conduit maakt een backup van de notitie-aantekeningen naar een lokale map.
+ Comment[pl]=Ten łącznik robi kopię zapasową rysunków z Notatnika do lokalnego katalogu.
+ Comment[pt]=Esta conduta salvaguarda desenhos NotePad para uma pasta local.
+Index: kpilot/conduits/memofileconduit/memofile-conduit.cc
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.cc (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/memofileconduit/memofile-conduit.cc (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -114,7 +114,7 @@
+ setFirstSync( _memofiles->isFirstSync() );
+ addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory));
+
+- if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || isFirstSync() ) {
++ if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
+ addSyncLogEntry(i18n(" Copying Pilot to PC..."));
+ #ifdef DEBUG
+ DEBUGCONDUIT << fname << ": copying Pilot to PC." << endl;
+@@ -474,17 +474,11 @@
+ // Note: This will reset both fCategories and fMemoAppInfo, so
+ // after this, we need to reinitialize our memofiles object...
+ setAppInfo();
+- cleanup();
+
+ // re-create our memofiles helper...
+ delete _memofiles;
+ _memofiles = new Memofiles(fCategories, *fMemoAppInfo, _memo_directory);
+
+- // make sure we are starting with a clean database on both ends...
+- fDatabase->deleteRecord(0, true);
+- fLocalDatabase->deleteRecord(0, true);
+- cleanup();
+-
+ _memofiles->load(true);
+
+ QPtrList<Memofile> memofiles = _memofiles->getAll();
+@@ -496,11 +490,39 @@
+ }
+
+ _memofiles->save();
+-
++
++ // now that we've copied from the PC to our handheld, remove anything extra from the
++ // handheld...
++ deleteUnsyncedHHRecords();
++
+ return true;
+
+ }
+
++void MemofileConduit::deleteUnsyncedHHRecords()
++{
++ FUNCTIONSETUP;
++ if ( syncMode()==SyncMode::eCopyPCToHH )
++ {
++ RecordIDList ids=fDatabase->idList();
++ RecordIDList::iterator it;
++ for ( it = ids.begin(); it != ids.end(); ++it )
++ {
++ if (!_memofiles->find(*it))
++ {
++#ifdef DEBUG
++ DEBUGCONDUIT << fname
++ << "Deleting record with ID "<<*it <<" from handheld "
++ << "(is not on PC, and syncing with PC->HH direction)"
++ << endl;
++#endif
++ fDatabase->deleteRecord(*it);
++ fLocalDatabase->deleteRecord(*it);
++ }
++ }
++ }
++}
++
+ int MemofileConduit::writeToPilot(Memofile * memofile)
+ {
+ FUNCTIONSETUP;
+Index: kpilot/conduits/memofileconduit/memofile-conduit.h
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.h (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/memofileconduit/memofile-conduit.h (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -88,6 +88,7 @@
+
+ bool copyHHToPC();
+ bool copyPCToHH();
++ void deleteUnsyncedHHRecords();
+ bool sync();
+
+ int writeToPilot(Memofile * memofile);
+Index: kpilot/conduits/memofileconduit/memofile-conduit.desktop
+===================================================================
+--- kpilot/conduits/memofileconduit/memofile-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/memofileconduit/memofile-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -39,6 +39,7 @@
+ Comment[hu]=Ezzel a csatolóval egy kézi számítógép memóit lehet szinkronizálni a helyi címjegyzékkel.
+ Comment[is]=Þessi rás samstillir minnismiða lófatölvunnar þinnar við staðbundna möppu.
+ Comment[it]=Questo condotto sincronizza gli appunti del tuo palmare con una cartella locale.
++Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
+ Comment[nl]=Dit conduit synchroniseert de memo's van uw handheld met een lokale map.
+ Comment[pl]=Ten łącznik synchronizuje notatki z palmtopa z lokalnym katalogiem.
+ Comment[pt]=Esta conduta sincroniza os memos do seu PDA com uma pasta local.
+Index: kpilot/conduits/perlconduit/perl-conduit.desktop
+===================================================================
+--- kpilot/conduits/perlconduit/perl-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/perlconduit/perl-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -53,6 +53,7 @@
+ Comment[is]=Þessi sýnishornarás keyrir Perl túlk.
+ Comment[it]=Questo conduit avvia un interprete Perl.
+ Comment[ja]=このサンプルはPerlインタープリタを実行します。
++Comment[lt]=Šis pavyzdinis kanalas vykdo Perl interpretatorių.
+ Comment[nb]=Denne kanalen kjører en Perl tolker.
+ Comment[nl]=Dit voorbeeld-conduit start een Perl-interpreteerder.
+ Comment[nn]=Denne kanalen køyrer ein Perl-tolkar.
+Index: kpilot/conduits/docconduit/kpalmdoc.desktop
+===================================================================
+--- kpilot/conduits/docconduit/kpalmdoc.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/docconduit/kpalmdoc.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -25,6 +25,7 @@
+ GenericName[is]=PalmDOC umbreytir
+ GenericName[it]=Convertitore PalmDOC
+ GenericName[ja]= PalmDOC コンバータ
++GenericName[lt]=PalmDOC konverteris
+ GenericName[nb]=PalmDOC-konvertering
+ GenericName[nl]=PalmDOC-conversie
+ GenericName[nn]=PalmDOC-omformar
+Index: kpilot/conduits/docconduit/doc_conduit.desktop
+===================================================================
+--- kpilot/conduits/docconduit/doc_conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/docconduit/doc_conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -15,6 +15,7 @@
+ Comment[hu]=Szöveges fájlok hozzáadása a kézi számítógéphez, DOC-olvasók számára.
+ Comment[is]=Bætir textaskrám, sem hægt er að lesa í DOC lesara, við lófatölvuna þína.
+ Comment[it]=Aggiunge file di testo al tuo Pilot, adatti per lettori DOC.
++Comment[lt]=Prideda teksto bylas prie Jūsų nešiojamos knygelės, tinka DOC skaityklėms.
+ Comment[nl]=Voegt tekstvelden toe aan uw handheld, geschikt voor DOC-lezers.
+ Comment[nn]=Legg til tekstfiler på den handhaldne, passar til DOC-lesarar.
+ Comment[pl]=Dodaje pliki tekstowe do Twojego palmtopa, w postaci odpowiedniej dla przeglądarek DOC.
+Index: kpilot/conduits/malconduit/mal_conduit.desktop
+===================================================================
+--- kpilot/conduits/malconduit/mal_conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/malconduit/mal_conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -52,6 +52,7 @@
+ Comment[hu]=AvantGo (vagy MAL-kiszolgáló) adatainak szinkronizálása a kézi számítógéppel. Lehetővé teszi weboldalak offline módban való megtekintését, például a mozi- vagy tévéműsort, vagy bármi mást.
+ Comment[is]=Samstillir AvantGo (eða venjulega innihald MAL þjóns) við lófatölvuna. Þetta gerir þér kleyft að skoða vefsíður þegar þú ert ótengd(ur) vefnum, t.d. kvikmynda eða sjónvarpsdagskrá.
+ Comment[it]=Sincronizza AvantGo (o il contenuto di un generico server MAL) con il palmare. In questo modo potrai visualizzare le pagine web offline sul palmare come per esempio la programmazione di un cinema o una TV o qualsiasi altra pagina web.
++Comment[lt]=Sinchronizuoti AvantGo (ar MAL serverio turinį apskritai) su nešiojamu įrenginiu. Tai leis jums peržiūrėti žiniatinklio puslapius nešiojamame įrenginyje, tokius kaip kino teatro ar TV programas, bei bet kokį kitą puslapį, neprisijungus prie Interneto.
+ Comment[nl]=Avantgo met de handheld synchroniseren (of eigenlijk met de inhoud van een MAL-server). Dit maakt het mogelijk om een webpagina offline op uw handheld te bekijken. Dit is handig voor allerlei zaken als bijvoorbeeld de TV-gids.
+ Comment[pl]=Synchronizuje AvantGo (lub ogólnie zawartość serwera MAL) z palmtopem. Pozwala to przeglądać bez połączenia z siecią strony WWW na palmtopie, np. repertuar kin lub program telewizyjny.
+ Comment[pt]=Sincroniza o AvantGo (ou, genericamente, o conteúdo de um servidor de MAL) para o dispositivo móvel. Isto permite-lhe ver as páginas Web no dispositivo móvel sem estar ligado, como o seu horário de cinema ou TV ou ainda qualquer outra página Web.
+Index: kpilot/conduits/popmail/popmail-conduit.desktop
+===================================================================
+--- kpilot/conduits/popmail/popmail-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/popmail/popmail-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -15,6 +15,7 @@
+ Comment[hu]=Ezzel a csatolóval kézi számítógépről lehet levelet küldeni a KMailen keresztül.
+ Comment[is]=Sendu tölvupóst frá lófatölvunni þinni gegnum KMail.
+ Comment[it]=Invia la posta dal tuo palmare tramite KMail.
++Comment[lt]=Siųsti paštą iš nešiojamo įrenginio per KMail.
+ Comment[nl]=Dit conduit verzendt mail van uw handheld met behulp van KMail.
+ Comment[pl]=Wysyła pocztę z palmtopa za pomocą KMail.
+ Comment[pt]=Enviar e-mail do seu dispositivo móvel através do KMail.
+Index: kpilot/conduits/knotes/knotes-conduit.desktop
+===================================================================
+--- kpilot/conduits/knotes/knotes-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/knotes/knotes-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -19,6 +19,7 @@
+ Comment[is]=Þessi rás samstillir lófatölvuna þína við KNotes.
+ Comment[it]=Questo condotto sincronizza l'applicazione Memo Pad con KNotes.
+ Comment[ja]=このコンジットはKNotes とメモ帳を同期させます。
++Comment[lt]=Šis kanalas sinchronizuoja Memo Pad programą su KNotes.
+ Comment[nb]=Denne kanalen synkroniserer notatblokk-applikasjonen med KNotes.
+ Comment[nl]=Dit conduit synchroniseert de Memo Pad met KNotes.
+ Comment[nn]=Denne koplinga synkroniserer «Memo Pad»-applikasjonen med KNotes.
+Index: kpilot/conduits/pythonconduit/python-conduit.desktop
+===================================================================
+--- kpilot/conduits/pythonconduit/python-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/pythonconduit/python-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -53,6 +53,7 @@
+ Comment[is]=Þessi sýnishornarás keyrir Python túlk.
+ Comment[it]=Questo conduit avvia un interprete Phython.
+ Comment[ja]=このサンプルは Python インタープリタを実行します。
++Comment[lt]=Šis pavyzdinis kanalas vykdo Python interpretatorių.
+ Comment[nb]=Denne prøve kanalen kjører en Python tolker.
+ Comment[nl]=Dit voorbeeld-conduit start een Python-interpreteerder.
+ Comment[nn]=Denne prøvekanalen køyrer en Python-tolkar.
+Index: kpilot/conduits/null/null-conduit.desktop
+===================================================================
+--- kpilot/conduits/null/null-conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/null/null-conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -25,6 +25,7 @@
+ Comment[is]=Þessi rás gerir ekki neitt.
+ Comment[it]=Questo conduit non fa nulla.
+ Comment[ja]=このコンジットは未知です。
++Comment[lt]=Šis kanalas nieko neatlieka.
+ Comment[nb]=Denne kanalen gjør ingenting.
+ Comment[nl]=Dit conduit doet niets.
+ Comment[nn]=Denne koplinga gjer ingenting.
+Index: kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop
+===================================================================
+--- kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/conduits/abbrowserconduit/abbrowser_conduit.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -20,6 +20,7 @@
+ Comment[is]=Þessi rás samstillir póstfangaskrár KDE og lófatölvunnar
+ Comment[it]=Questo condotto sincronizza il tuo palmare con la rubrica indirizzi di KDE
+ Comment[ja]=このコンジットはKOrganizer日付帳とPilotを同期させます。
++Comment[lt]=Šis kanalas sinchronizuoja nešiojamą adresų knygelę su KDE adresų knygele.
+ Comment[nb]=Denne kanalen synkroniserer Pilotens adressebok med KDEs adressebok.
+ Comment[nl]=Dit conduit synchroniseert uw handheld met KDE's adresboek.
+ Comment[nn]=Denne koplinga synkroniserer den handheldte adresseboka med med KDE-adresseboka.
+Index: kpilot/kpilot/kpilot_config.desktop
+===================================================================
+--- kpilot/kpilot/kpilot_config.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/kpilot/kpilot_config.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -103,6 +103,7 @@
+ Keywords[is]=kpilot,aðal
+ Keywords[it]=kpilot,principale
+ Keywords[ja]=kpilot,主要
++Keywords[lt]=kpilot,main,pagrindinis
+ Keywords[nb]=kpilot,hoved
+ Keywords[nl]=kpilot,algemeen
+ Keywords[nn]=kpilot,hovud
+Index: kpilot/lib/pilotDatabase.cc
+===================================================================
+--- kpilot/lib/pilotDatabase.cc (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/lib/pilotDatabase.cc (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -185,7 +185,7 @@
+ int len = CATEGORY_NAME_SIZE - 1;
+ QCString t = PilotAppCategory::codec()->fromUnicode(s,len);
+ memset(categoryInfo()->name[i],0,CATEGORY_NAME_SIZE);
+- qstrncpy(categoryInfo()->name[i],t,kMin(len,(int)CATEGORY_NAME_SIZE));
++ qstrncpy(categoryInfo()->name[i],t,CATEGORY_NAME_SIZE);
+ return true;
+ }
+
+Index: kpilot/lib/data/MemoDB.pdb
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: kpilot/lib/data/MemoDB.pdb
+___________________________________________________________________
+Name: svn:mime-type
+ + application/octet-stream
+
+Index: kpilot/lib/pilotLocalDatabase.cc
+===================================================================
+--- kpilot/lib/pilotLocalDatabase.cc (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/lib/pilotLocalDatabase.cc (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -618,7 +618,7 @@
+
+ int count;
+ pi_file_get_entries(dbFile, &count);
+- if (count > 0)
++ if (count >= 0)
+ {
+ KPILOT_DELETE(d);
+ d = new Private(count);
+Index: kpilot/lib/testdatabase.cc
+===================================================================
+--- kpilot/lib/testdatabase.cc (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/lib/testdatabase.cc (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -27,8 +27,16 @@
+ */
+
+ #include "options.h"
++
++#include <kaboutdata.h>
++#include <kapplication.h>
++#include <kdebug.h>
++#include <klocale.h>
++#include <kcmdlineargs.h>
++
+ #include "pilotLocalDatabase.h"
+ #include "pilotRecord.h"
++#include "pilotMemo.h"
+
+
+ typedef struct { int id,size; } recordInfo;
+@@ -105,7 +113,7 @@
+ while( (r = db.readRecordByIndex(index) ) )
+ {
+ kdDebug() << "[" << index << "] id=" << r->id() << " size=" << r->getLen() << endl;
+- if ( info[index].id != r->id() )
++ if ( ((recordid_t)info[index].id) != r->id() )
+ {
+ kdDebug() << "* Bad ID (expected" << r->id() << ")" << endl;
+ fail++;
+@@ -138,8 +146,57 @@
+ { 0L, 0L }
+ } ;
+
++int checkMemo()
++{
++ PilotLocalDatabase *l = new PilotLocalDatabase(SOURCE "/data/MemoDB");
++ if (!l->isDBOpen()) return 1;
++
++ PilotMemoInfo *m = new PilotMemoInfo(l);
++ m->dump();
++
++ QString c = m->category(1);
++ if (c != CSL1("Business"))
++ {
++ kdDebug() << "* Category 1 is not 'Business' but " << c << endl;
++ return 1;
++ }
++
++ m->setCategory(2,CSL1("Aardvark"));
++ m->write(l);
++
++ c = m->category(2);
++ if (c != CSL1("Aardvark"))
++ {
++ kdDebug() << "* Category 2 is not 'Aardvark' but " << c << endl;
++ return 1;
++ }
++
++
++ delete m;
++ delete l;
++ return 0;
++}
++
++static const KCmdLineOptions options[] =
++{
++ {"verbose", "Verbose output", 0},
++ KCmdLineLastOption
++};
++
++
+ int main(int argc, char **argv)
+ {
++ KAboutData aboutData("testdatabase","Test Databases","0.1");
++ KCmdLineArgs::init(argc,argv,&aboutData);
++ KCmdLineArgs::addCmdLineOptions( options );
++
++ // KApplication app( false, false );
++ KApplication app;
++
++ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
++
++ Q_UNUSED(args)
++
+ int r = 0;
+ int i = 0;
+ #ifdef DEBUG
+@@ -156,6 +213,10 @@
+ i++;
+ }
+
++ kdDebug() << "*** Test " << i << endl;
++ if (checkMemo()) r++;
++ i++;
++
+ if (r)
+ {
+ kdDebug() << "***\n*** Failed " << r << " tests." << endl;
+Index: kpilot/lib/pilotDatabase.h
+===================================================================
+--- kpilot/lib/pilotDatabase.h (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kpilot/lib/pilotDatabase.h (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -279,9 +279,12 @@
+ int appLen = MAX_APPINFO_SIZE;
+ unsigned char buffer[MAX_APPINFO_SIZE];
+
+- appLen = d->readAppBlock(buffer,appLen);
+-
+- (*unpack)(&fInfo, buffer, appLen);
++ if (d && d->isDBOpen())
++ {
++ appLen = d->readAppBlock(buffer,appLen);
++ (*unpack)(&fInfo, buffer, appLen);
++ }
++ // fInfo is just a struct, so we can point to it anyway.
+ init(&fInfo.category,appLen);
+ } ;
+
+@@ -289,6 +292,10 @@
+ {
+ FUNCTIONSETUP;
+ unsigned char buffer[MAX_APPINFO_SIZE];
++ if (!d || !d->isDBOpen())
++ {
++ return -1;
++ }
+ int appLen = (*pack)(&fInfo, buffer, length());
+ if (appLen > 0)
+ {
+Index: kontact/plugins/korganizer/todoplugin.desktop
+===================================================================
+--- kontact/plugins/korganizer/todoplugin.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kontact/plugins/korganizer/todoplugin.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -44,7 +44,7 @@
+ Comment[uk]=Втулок списку завдань KOrganizer для Kontact
+ Comment[zh_CN]=Kontact KOrganizer 待办清单插件
+ Name=To-do List
+-Name[ca]=Llista de pendents
++Name[ca]=Pendents
+ Name[cs]=Seznam úkolů
+ Name[cy]=Rhestr I'w-Wneud
+ Name[da]=Gøremålsliste
+Index: kandy/src/kandy.desktop
+===================================================================
+--- kandy/src/kandy.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kandy/src/kandy.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -21,6 +21,7 @@
+ Comment[is]=Tól sem samstillir vistfangagögn við farsíma
+ Comment[it]=Strumento per sincronizzare i dati della rubrica indirizzi con i telefoni cellulari
+ Comment[ja]=携帯電話を備えた住所録データを同期するためのツール
++Comment[lt]=Įrankis adresų knygelės sinchronizavimui su mobiliaisiais telefonais
+ Comment[nb]=Verktøy for synkronisering av adressebok med mobiltelefoner
+ Comment[nl]=Hulpmiddel om adresboekgegevens te synchroniseren met mobiele telefoons
+ Comment[nn]=Verktøy for å synkronisera adresseboka med mobiltelefonar
+Index: kfile-plugins/rfc822/kfile_rfc822.desktop
+===================================================================
+--- kfile-plugins/rfc822/kfile_rfc822.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kfile-plugins/rfc822/kfile_rfc822.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -22,6 +22,7 @@
+ Name[is]=Tölvupóst upplýsingar
+ Name[it]=Informazioni di posta elettronica
+ Name[ja]=Eメール 情報
++Name[lt]=E. pašto info
+ Name[ms]=Info Emel
+ Name[nb]=E-post-info
+ Name[nl]=E-mail-informatie
+Index: kfile-plugins/ics/kfile_ics.desktop
+===================================================================
+--- kfile-plugins/ics/kfile_ics.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kfile-plugins/ics/kfile_ics.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -18,6 +18,7 @@
+ Name[hu]=ICS-jellemzők
+ Name[is]=ICS upplýsingar
+ Name[it]=Informazioni ICS
++Name[lt]=ICS informacija
+ Name[nl]=ICS-informatie
+ Name[nn]=ICS-informasjon
+ Name[pa]=ICS ਜਾਣਕਾਰੀ
+Index: kfile-plugins/palm-databases/kfile_palm.desktop
+===================================================================
+--- kfile-plugins/palm-databases/kfile_palm.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ kfile-plugins/palm-databases/kfile_palm.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -20,6 +20,7 @@
+ Name[is]=PalmOS gagnagrunnsupplýsingar
+ Name[it]=Informazioni database PalmOs
+ Name[ja]=PalmOS データベース 情報
++Name[lt]=PalmOS duomenų bazės info
+ Name[nb]=PalmOS Database info
+ Name[nl]=PalmOS-database informatie
+ Name[nn]=PalmOS-databaseinfo
+Index: korganizer/korgac/koalarmclient.cpp
+===================================================================
+--- korganizer/korgac/koalarmclient.cpp (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ korganizer/korgac/koalarmclient.cpp (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -165,6 +165,7 @@
+ bool KOAlarmClient::commitData( QSessionManager& )
+ {
+ emit saveAllSignal();
++ saveLastCheckTime();
+ return true;
+ }
+
+Index: korganizer/plugins/timespanview/timespanview.desktop
+===================================================================
+--- korganizer/plugins/timespanview/timespanview.desktop (.../tags/KDE/3.4.1/kdepim) (revision 421156)
++++ korganizer/plugins/timespanview/timespanview.desktop (.../branches/KDE/3.4/kdepim) (revision 421156)
+@@ -39,6 +39,7 @@
+ Comment[hu]=Ezzel modullal egy időszakot lehet áttekinteni a KOrganizerben (például a feladatokat vagy a havi nézeteket). Ha aktiválja ezt a modult, átválthat időszakos nézetbe, hogy az események Gantt-diagramon legyenek megtekinthetők.
+ Comment[is]=Þetta íforrit veitir tímabilssýn fyrir KOrganizer (svipað og verkþátta eða mánaðarsýn). Ef þú virkjar þetta íforrit getur þú skipt yfir í tímabilssýn og skoðað atburðina þína eins og á Gantt skýringarmynd.
+ Comment[it]=Questo plugin fornisce una vista a intervalli temporali. Se abiliti questo plugin, potrai passare alla vista a intervalli temporali e vedere i tuoi eventi come in un diagramma di Gantt.
++Comment[lt]=Šis priedas korganizer programoje sudaro galimybę apžvelgti laiko tarpą (pvz., to-do arba mėnesio peržiūra). Įgalinus šį priedą galėsite persijungti į laiko tarpo peržiūrą ir žiūrėti įvykius tarsi Gantt diagramoje.
+ Comment[nl]=Deze plugin biedt een weergave voor KOrganizer (zoals de takenlijst en de maandweergave). Wanneer u deze plugin inschakelt kunt u kiezen voor een weergave waarin u uw evenementen in een Gantt-diagram kunt bekijken.
+ Comment[pl]=Ta wtyczka tworzy widok zakresu czasu w KOrganizerze (tak jak widok zadań do zrobienia lub widok miesiąca). Po włączeniu tej wtyczki możliwe jest przełączenie się na widok zakresu czasu i przeglądanie zdarzeń jak na diagramie Gantta.
+ Comment[pt]=Este 'plugin' oferece uma vista de distribuição temporal para o KOrganizer (como as vistas de itens por-fazer ou mensais). Se activar este 'plugin', poderá mudar para a vista de distribuição temporal e ver os seus eventos como num diagrama de Gantt.
+
+Property changes on:
+___________________________________________________________________
+Name: svn:externals
+ + admin https://svn.kde.org/home/kde/branches/KDE/3.4/kde-common/admin
+
+
Modified: branches/kde-3.4.0/packages/kdepim/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/rules 2005-06-02 23:54:30 UTC (rev 1181)
+++ branches/kde-3.4.0/packages/kdepim/debian/rules 2005-06-03 05:41:44 UTC (rev 1182)
@@ -37,38 +37,22 @@
DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
shlibs_ver=4:3.4.0
-DEB_DH_MAKESHLIBS_ARGS_libkcal2a := -V'libkcal2a (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkcal2a := -V'libkcal2a (>= 4:3.4.1)'
DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkdepim1 := -V'libkdepim1 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkgantt0 := -V'libkgantt0 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkleopatra0 := -V'libkleopatra0 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkpimexchange1 := -V'libkpimexchange1 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= 4:3.4.1)'
DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libktnef1 := -V'libktnef1 (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libmimelib1 := -V'libmimelib1 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_akregator := -V
-DEB_DH_MAKESHLIBS_ARGS_kaddressbook := -V
-DEB_DH_MAKESHLIBS_ARGS_kalarm := -V
-DEB_DH_MAKESHLIBS_ARGS_kdepim-wizards := -V
-DEB_DH_MAKESHLIBS_ARGS_kitchensync := -V
-DEB_DH_MAKESHLIBS_ARGS_kleopatra := -V
-DEB_DH_MAKESHLIBS_ARGS_kmail := -V
-DEB_DH_MAKESHLIBS_ARGS_knode := -V
-DEB_DH_MAKESHLIBS_ARGS_knotes := -V
-DEB_DH_MAKESHLIBS_ARGS_kode := -V
-DEB_DH_MAKESHLIBS_ARGS_kontact := -V
-DEB_DH_MAKESHLIBS_ARGS_korganizer := -V
-DEB_DH_MAKESHLIBS_ARGS_kpilot := -V
-DEB_DH_MAKESHLIBS_ARGS_ksync := -V
-DEB_DH_MAKESHLIBS_ARGS_ktnef := -V
-PKGS_WITH_LIBS := akregator kaddressbook kalarm kdepim-wizards kitchensync \
- kleopatra kmail knode knotes kode kontact korganizer kpilot ksync \
- ktnef libkcal2a libkdenetwork2 libkdepim1 libkgantt0 libkleopatra0 \
- libkpimexchange1 libkpimexchange1 libkpimidentities1 libksieve0 \
- libktnef1 libmimelib1
-DEB_SHLIBDEPS_INCLUDE := $(foreach p, $(PKGS_WITH_LIBS), debian/$(p)/usr/lib)
+PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
+ kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
+ korganizer kpilot ksync ktnef libkcal2a libkdenetwork2 libkdepim1 \
+ libkgantt0 libkleopatra0a libkpimexchange1 libkpimidentities1 \
+ libksieve0 libktnef1 libmimelib1a
# kontact starts fine without korganizer or kpilot dependencies
# specialdates is only in recommends to get the kaddressbook dependency there
@@ -84,5 +68,12 @@
$(foreach p,$(kontact_suggests_plugins),debian/kontact/usr/lib/kde3/libkontact_$(p)plugin.so) \
-dDepends # Since -u args go first in dpkg-shlibdeps call
+# Move kaddressbook dependency (from libkabc_xmlrpc.so) to Recommends
+DEB_DH_SHLIBDEPS_ARGS_kdepim-kresources := \
+ -Xusr/lib/libkabc_xmlrpc.so.1 \
+ -- -dRecommends \
+ debian/kdepim-kresources/usr/lib/libkabc_xmlrpc.so.1.* \
+ -dDepends
+
test-shlibdeps:
@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact)