[Pkg-kde-commits] rev 719 - in branches/kde-3.4.0/packages/kdepim/debian: . icons patches

Daniel Schepler schepler@costa.debian.org
Sun, 06 Mar 2005 13:33:15 +0100


Author: schepler
Date: 2005-03-06 13:33:12 +0100 (Sun, 06 Mar 2005)
New Revision: 719

Added:
   branches/kde-3.4.0/packages/kdepim/debian/akregator.install
   branches/kde-3.4.0/packages/kdepim/debian/akregator.menu
   branches/kde-3.4.0/packages/kdepim/debian/icons/akregator-16.xpm
   branches/kde-3.4.0/packages/kdepim/debian/icons/akregator.xpm
   branches/kde-3.4.0/packages/kdepim/debian/kode.install
   branches/kde-3.4.0/packages/kdepim/debian/libktnef1-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libktnef1.install
   branches/kde-3.4.0/packages/kdepim/debian/networkstatus.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/10_korganizer_makefile.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/11_lib_link.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/12_kmail_nofinal.diff
Removed:
   branches/kde-3.4.0/packages/kdepim/debian/kde.mk
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc-html.doc-base.kcontrol-kalarmd
   branches/kde-3.4.0/packages/kdepim/debian/libkdenetwork2.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/02_disable_no_undefined.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/03_automake1.8.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/04_disable_static_la_final.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/20_korganizer_makefile.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/21_lib_link.diff
   branches/kde-3.4.0/packages/kdepim/debian/patches/22_kmail_nofinal.diff
Modified:
   branches/kde-3.4.0/packages/kdepim/debian/
   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/kalarm.install
   branches/kde-3.4.0/packages/kdepim/debian/kandy.install
   branches/kde-3.4.0/packages/kdepim/debian/karm.install
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc.install
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-kfile-plugins.install
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-kio-plugins.install
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-wizards.install
   branches/kde-3.4.0/packages/kdepim/debian/kitchensync.install
   branches/kde-3.4.0/packages/kdepim/debian/kleopatra.install
   branches/kde-3.4.0/packages/kdepim/debian/kmail.install
   branches/kde-3.4.0/packages/kdepim/debian/kmailcvt.install
   branches/kde-3.4.0/packages/kdepim/debian/knode.install
   branches/kde-3.4.0/packages/kdepim/debian/knotes.install
   branches/kde-3.4.0/packages/kdepim/debian/konsolekalendar.install
   branches/kde-3.4.0/packages/kdepim/debian/kontact.install
   branches/kde-3.4.0/packages/kdepim/debian/korganizer.install
   branches/kde-3.4.0/packages/kdepim/debian/korn.install
   branches/kde-3.4.0/packages/kdepim/debian/kpilot.install
   branches/kde-3.4.0/packages/kdepim/debian/ksync.install
   branches/kde-3.4.0/packages/kdepim/debian/ktnef.install
   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/libkdepim1.install
   branches/kde-3.4.0/packages/kdepim/debian/libkgantt0-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libkgantt0.install
   branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install
   branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1.install
   branches/kde-3.4.0/packages/kdepim/debian/libkpimidentities1.install
   branches/kde-3.4.0/packages/kdepim/debian/libksieve0-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libksieve0.install
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install
   branches/kde-3.4.0/packages/kdepim/debian/patches/
   branches/kde-3.4.0/packages/kdepim/debian/rules
Log:
Commit my work on kdepim so far.  It's still not done; I need to write a
couple man pages and doc-base files, check the Replaces, etc.  But at least
every file has a home now.



Property changes on: branches/kde-3.4.0/packages/kdepim/debian
___________________________________________________________________
Name: svn:externals
   + cdbs svn://svn.debian.org/pkg-kde/branches/kde-3.4.0/cdbs


Added: branches/kde-3.4.0/packages/kdepim/debian/akregator.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/akregator.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/akregator.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,22 @@
+/usr/bin/akregator
+/usr/lib/kde3/libakregatorpart.la
+/usr/lib/kde3/libakregatorpart.so
+/usr/lib/libakregatorprivate.la
+/usr/lib/libakregatorprivate.so
+/usr/share/applnk/Internet/akregator.desktop
+/usr/share/apps/akregator
+/usr/share/config.kcfg/akregator.kcfg
+/usr/share/doc/kde/HTML/en/akregator
+/usr/share/icons/crystalsvg/128x128/apps/akregator.png
+/usr/share/icons/crystalsvg/16x16/apps/akregator_empty.png
+/usr/share/icons/crystalsvg/16x16/apps/akregator.png
+/usr/share/icons/crystalsvg/22x22/apps/akregator.png
+/usr/share/icons/crystalsvg/32x32/apps/akregator.png
+/usr/share/icons/crystalsvg/48x48/apps/akregator.png
+/usr/share/icons/crystalsvg/64x64/apps/akregator.png
+/usr/share/icons/crystalsvg/scalable/apps/akregator.svgz
+/usr/share/services/akregator_part.desktop
+/usr/share/services/feed.protocol
+../icons/akregator.xpm /usr/share/pixmaps
+../icons/akregator-16.xpm /usr/share/pixmaps
+

Added: branches/kde-3.4.0/packages/kdepim/debian/akregator.menu
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/akregator.menu	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/akregator.menu	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,8 @@
+?package(akregator):\
+	needs="X11"\
+	section="Apps/Net"\
+	hints="KDE"\
+	title="aKregator"\
+	icon32x32="/usr/share/pixmaps/akregator.xpm"\
+	icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+	command="/usr/bin/akregator"

Modified: branches/kde-3.4.0/packages/kdepim/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,3 +1,19 @@
+kdepim (4:3.4.0-0pre1) experimental; urgency=low
+
+  * New upstream release.
+  * Change to using upstream tar.bz2.
+  * New packages: kode, networkstatus.
+  * Absorb akregator package.  Thanks to Pierre Habouzit for his fine work
+    on this package up until now.
+  * libkdenetwork2 split upstream into libkmime, which is now in the
+    libmimelib1a package, and libkpgp, which is now in the libkleopatra0a
+    package.
+  * Split off libktnef1 from the ktnef package since libkcal now depends
+    on it.
+    + Also split libktnef1-dev from kdepim-dev.
+
+ -- Daniel Schepler <schepler@debian.org>  Sun,  6 Mar 2005 02:56:54 -0800
+
 kdepim (4:3.3.2-2) unstable; urgency=low
 
   * Disable gnokii support again until bug #266566 is resolved.

Modified: branches/kde-3.4.0/packages/kdepim/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/control	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/control	2005-03-06 12:33:12 UTC (rev 719)
@@ -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, bzip2, cdbs, 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, libxpm-dev, sharutils, texinfo
+Build-Depends-Indep: doxygen, 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: 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}), 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,7 +23,7 @@
 Package: kdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-wizards (= ${Source-Version}), kmail (= ${Source-Version}), knode (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), ktnef (= ${Source-Version}), libkdenetwork2 (= ${Source-Version}), libkdepim1 (= ${Source-Version}), libkpimidentities1 (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-wizards (= ${Source-Version}), kmail (= ${Source-Version}), knode (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkdepim1 (= ${Source-Version}), libkpimidentities1 (= ${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)
 Description: KDE Personal Information Management [development]
@@ -54,6 +54,15 @@
  .
  This package is part of the official KDE pim module.
 
+Package: akregator
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: RSS feed aggregator for KDE
+ aKregator is a fast, lightweight, and intuitive feed reader program
+ for KDE.  It allows you to quickly browse through hundreds of
+ thousands of internet feeds in a quick, efficient, and familiar way.
+
 Package: kaddressbook
 Section: utils
 Architecture: any
@@ -115,6 +124,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: kdebase-kio-plugins (<< 4:3.4.0)
 Description: KDE pim I/O Slaves
  This package includes the pim kioslaves. This includes newimap4 and sieve.
  .
@@ -135,6 +145,7 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
+Suggests: konqueror
 Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
  development.
@@ -162,8 +173,7 @@
 Package: kmail
 Section: mail
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
-Recommends: kdebase-kio-plugins, kdepim-kio-plugins
+Depends: ${shlibs:Depends}, ${perl:Depends}, kdepim-kio-plugins | kdebase-kio-plugins
 Suggests: gnupg, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter, clamav | f-prot-installer
 Replaces: libkdenetwork2 (<< 4:3.2.92)
 Provides: imap-client, mail-reader
@@ -172,9 +182,8 @@
  desktop. It has features such as support for IMAP, POP3, multiple accounts,
  mail filtering and sorting, PGP/GnuPG privacy, and inline attachments.
  .
- You need to install kdepim-kio-plugins if you want to use IMAP, and/or
- kdebase-kio-plugins if you want to use POP3. If you are using aptitude,
- these should be installed for you automatically.
+ You need to install kdepim-kio-plugins if you want to use IMAP or
+ mbox files, and/or kdebase-kio-plugins if you want to use POP3.
  .
  This package is part of the official KDE pim module.
 
@@ -215,6 +224,15 @@
  .
  This package is part of the official KDE pim module.
 
+Package: kode
+Section: devel
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Helper library for programmatic generation of C++ code
+ This package includes a program kode for generation of C++ template files
+ and kxml_compiler for generation of C++ classes representing XML data
+ described by RelaxNG schemes.
+
 Package: konsolekalendar
 Section: kde
 Architecture: any
@@ -233,7 +251,7 @@
 Depends: ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}, kaddressbook, kitchensync, kmail, knode, knotes
 Suggests: ${shlibs:Suggests}, knewsticker, kweather
-Replaces: kontact-plugins (<< 4:3.2.92)
+Replaces: kontact-plugins (<< 4:3.2.92), akregator (<< 4:3.4.0)
 Conflicts: kontact-plugins (<< 4:3.2.92)
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
@@ -321,6 +339,16 @@
  .
  This package is part of the official KDE pim module.
 
+Package: networkstatus
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE network status monitor
+ NetworkStatus tracks the status of network interfaces and provides
+ notification to applications when this status changes.
+ .
+ This package is part of the official KDE pim module.
+
 Package: libkcal2a
 Section: libs
 Architecture: any
@@ -350,22 +378,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libkdenetwork2
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
-Replaces: kgpgcertmanager (<< 4:3.2.0), kmail (<< 4:3.2.0), knode (<< 4:3.2.0)
-Description: KDE Network library
- This is the runtime package for programs that use the libkdenetwork library.
- .
- This package is part of the official KDE pim module.
-
 Package: libkdepim1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Conflicts: kdepim-libs (<< 4:3.2.0)
-Replaces: kdepim-libs (<< 4:3.2.0)
+Replaces: kdepim-libs (<< 4:3.2.0), akregator (<< 4:3.4.0)
 Description: KDE PIM library
  This is the runtime package for programs that use the libkdepim library.
  .
@@ -475,6 +493,37 @@
  .
  This package is part of the official KDE pim module.
 
+Package: libktnef1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: ktnef (<< 4:3.4.0)
+Description: Library for handling KTNEF email attachments
+ This library handles mail attachments using the TNEF format. These
+ attachments are usually found in mails coming from Microsoft mail
+ servers and embed the mail properties as well as the actual
+ attachments.
+ .
+ This is the runtime library for packages using the ktnef library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libktnef1-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdepim-dev (<< 4:3.4.0)
+Description: KTNEF handler library [development]
+ This library handles mail attachments using the TNEF format. These
+ attachments are usually found in mails coming from Microsoft mail
+ servers and embed the mail properties as well as the actual
+ attachments.
+ .
+ This is the development package which contains the headers for the
+ ktnef library.
+ .
+ This package is part of the official KDE pim module.
+
 Package: libmimelib1a
 Section: libs
 Architecture: any

Added: branches/kde-3.4.0/packages/kdepim/debian/icons/akregator-16.xpm
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/icons/akregator-16.xpm	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/icons/akregator-16.xpm	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,72 @@
+/* XPM */
+static char *akregator-16[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 50 1",
+"  c black",
+". c #131317",
+"X c #21212E",
+"o c gray32",
+"O c #58586A",
+"+ c #555578",
+"@ c #7C7C93",
+"# c #F91A00",
+"$ c #FF7C00",
+"% c #82828D",
+"& c #80809B",
+"* c #92929E",
+"= c #9B9BAF",
+"- c #A2A2AE",
+"; c #A7A7BC",
+": c #B1B1C3",
+"> c #B2B2C4",
+", c #BDBDC7",
+"< c #BDBDCC",
+"1 c #BDBDCD",
+"2 c #C0A0A4",
+"3 c #E4B9AB",
+"4 c #E4C49A",
+"5 c #C5C5C9",
+"6 c #C2C2D2",
+"7 c #C5C3D1",
+"8 c #C4C4D1",
+"9 c #C6C6D3",
+"0 c #C6C6D4",
+"q c #C9C7D5",
+"w c #CECEDA",
+"e c #D0CDD9",
+"r c #D3CED8",
+"t c #D2D2D9",
+"y c #D4D2DB",
+"u c #D7D7DF",
+"i c #DAD0D5",
+"p c #D9D9E0",
+"a c #DADAE2",
+"s c #DCDCE4",
+"d c #E0CFC9",
+"f c #E5DBE0",
+"g c #E3E3E9",
+"h c #E4E4E9",
+"j c #EAEAEF",
+"k c #EDECF1",
+"l c #EDEDF1",
+"z c #F2F2F4",
+"x c gray100",
+"c c None",
+/* pixels */
+"cccccccccccccccc",
+"cccccccccccccccc",
+"cccccccccccccccc",
+"                ",
+"############3fp:",
+"#xxx$xx$xx$$dkzw",
+"#x$x$x$$x$$$i5%.",
+"#xx$$$x$$x$4yt  ",
+"#x$x$xx$xx$ejk8X",
+"#$$$$$$$$$e,-91 ",
+"######28q0gs    ",
+"      1puohg@   ",
+"      =p> *8O   ",
+"      +;&       ",
+"cccccc         c",
+"cccccc        cc"
+};

Added: branches/kde-3.4.0/packages/kdepim/debian/icons/akregator.xpm
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/icons/akregator.xpm	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/icons/akregator.xpm	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,248 @@
+/* XPM */
+static char *akregator[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 210 2",
+"   c #000000",
+".  c #05050A",
+"X  c #0D0D0D",
+"o  c #111115",
+"O  c #25252F",
+"+  c #2A2A30",
+"@  c #32323B",
+"#  c #3A3A48",
+"$  c #454551",
+"%  c #474759",
+"&  c #4A4A59",
+"*  c #545464",
+"=  c #55556A",
+"-  c #585861",
+";  c #595969",
+":  c #646471",
+">  c #6F6F77",
+",  c #6B6B7E",
+"<  c #71717E",
+"1  c #6D6D83",
+"2  c #747485",
+"3  c #7A7A8C",
+"4  c #BA5A00",
+"5  c #BF752E",
+"6  c #BB7D45",
+"7  c #DE2900",
+"8  c #DE3300",
+"9  c #E20000",
+"0  c #E90000",
+"q  c #EE1E00",
+"w  c #F00000",
+"e  c #E22800",
+"r  c #EB2A00",
+"t  c #FD2700",
+"y  c #F73000",
+"u  c #F93000",
+"i  c #CB4B25",
+"p  c #CB6200",
+"a  c #DD6B00",
+"s  c #E37A01",
+"d  c #FF7C00",
+"f  c #FD6E25",
+"g  c #FD7027",
+"h  c #FD7129",
+"j  c #BB8009",
+"k  c #B69016",
+"l  c #BC8E3F",
+"z  c #AD8056",
+"x  c #B68C51",
+"c  c #B39557",
+"v  c #BF9768",
+"b  c #C5880E",
+"n  c #CE9A00",
+"m  c #DB9900",
+"M  c #C68E39",
+"N  c #DA8637",
+"B  c #C8A42E",
+"V  c #E1850A",
+"C  c #E39900",
+"Z  c #EE9701",
+"A  c #FF8200",
+"S  c #FF850B",
+"D  c #FF8B00",
+"F  c #FF8614",
+"G  c #FA8B14",
+"H  c #F39202",
+"J  c #FF9300",
+"K  c #FF9D00",
+"L  c #F7901C",
+"P  c #FF9B10",
+"I  c #E58123",
+"U  c #F08521",
+"Y  c #F4943A",
+"T  c #FF9A3C",
+"R  c #EFB502",
+"E  c #F7AE00",
+"W  c #FFA600",
+"Q  c #FCAB00",
+"!  c #FAAB0D",
+"~  c #FEAF1D",
+"^  c #FFB100",
+"/  c #FFB50B",
+"(  c #FFBA00",
+")  c #EBB835",
+"_  c #FEAF25",
+"`  c #FFAC2E",
+"'  c #C79159",
+"]  c #CE9F5D",
+"[  c #C39F6F",
+"{  c #CE9E67",
+"}  c #CF9F73",
+"|  c #C1A546",
+" . c #D0A85A",
+".. c #D6BD7B",
+"X. c #F09B42",
+"o. c #FF9F45",
+"O. c #E79F7E",
+"+. c #E0B643",
+"@. c #FFAA48",
+"#. c #FFAE52",
+"$. c #FFA959",
+"%. c #FFBC56",
+"&. c #FFBC5B",
+"*. c #E5B161",
+"=. c #EDB267",
+"-. c #FFAE62",
+";. c #FFBE6F",
+":. c #FFB570",
+">. c #FFBC7D",
+",. c #FFC200",
+"<. c #FFCB00",
+"1. c #FACA08",
+"2. c #FFD000",
+"3. c #FFC64A",
+"4. c #FFC272",
+"5. c #81818D",
+"6. c #818196",
+"7. c #838398",
+"8. c #8C8C96",
+"9. c #8D8D9D",
+"0. c #92929E",
+"q. c #8C8CA0",
+"w. c #9090A6",
+"e. c #9595AA",
+"r. c #9B9BAD",
+"t. c #9D9DB0",
+"y. c #A7A7B2",
+"u. c #A6A6B8",
+"i. c #ADADB7",
+"p. c #AAAABC",
+"a. c #B6AAB6",
+"s. c #BFB5BE",
+"d. c #AFAFC1",
+"f. c #B4B4C3",
+"g. c #B8B8C7",
+"h. c #BBBBCA",
+"j. c #D898A0",
+"k. c #CFAD85",
+"l. c #CCAD8F",
+"z. c #C6A994",
+"x. c #C3AF9C",
+"c. c #CFBF99",
+"v. c #DEB289",
+"b. c #C5B2BB",
+"n. c #C6BABF",
+"m. c #E3B992",
+"M. c #FFBE82",
+"N. c #C2BDC9",
+"B. c #DDC7A5",
+"V. c #DBC4AB",
+"C. c #DACBAD",
+"Z. c #D8C6B9",
+"A. c #EDD192",
+"S. c #F4C085",
+"D. c #FDC48B",
+"F. c #FFCA8E",
+"G. c #F7CD96",
+"H. c #FFC691",
+"J. c #FFCA98",
+"K. c #E3C2A9",
+"L. c #E0CBB8",
+"P. c #F3D6A7",
+"I. c #FFD1A7",
+"U. c #FFD4AB",
+"Y. c #F7D3B2",
+"T. c #F1D9B2",
+"R. c #FFD7B2",
+"E. c #FFDAB3",
+"W. c #FFDBB9",
+"Q. c #C0C0CD",
+"!. c #CFC7C9",
+"~. c #C6C6D1",
+"^. c #C8C4D0",
+"/. c #C8C8D3",
+"(. c #D1C6D0",
+"). c #D2CDD8",
+"_. c #D5D0D3",
+"`. c #D4D4DD",
+"'. c #D8D6DF",
+"]. c #D8D7E2",
+"[. c #DCDBE4",
+"{. c #DFDFE9",
+"}. c #E0CFC7",
+"|. c #E2D6C0",
+" X c #E3D8C9",
+".X c #E3DBD1",
+"XX c #E0D9DA",
+"oX c #ECDED1",
+"OX c #F7DFC9",
+"+X c #FFDEC0",
+"@X c #E0DEE3",
+"#X c #ECE2D8",
+"$X c #F3E2CE",
+"%X c #F6E8C4",
+"&X c #F7E3D1",
+"*X c #F3E9DA",
+"=X c #FDE5D0",
+"-X c #FBEAD9",
+";X c #E1E1E7",
+":X c #E4E4EA",
+">X c #EFE8E2",
+",X c #EAEAEF",
+"<X c #ECECF2",
+"1X c #F5ECE3",
+"2X c #FBF7EC",
+"3X c #F5F5F8",
+"4X c #FBF6F3",
+"5X c #FCF9F6",
+"6X c #FDFCFC",
+"7X c None",
+/* pixels */
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X        7X7X7X",
+"0 0 0 0 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 j.(.(.g.r.<     ",
+"t f h h h h h h h h h h h h h f h f f f f f f f O.[.).:X`.h.p.w.",
+"u M.E.W.W.U.U.U.U.U.R.+XW.U.U.U.U.+XE.U.U.I.I.J.K.`.].6X6X6X6Xp.",
+"y :.-X6X6X6XoXH.H.=X6X3X6XV.F.W.6X5X6X#XS.D.D.-.}./.{.3X<X`.h.9.",
+"y $.&X5X6 }.6X} M.6Xx.' { v 4.1X Xx ] [ =.;.#.S XXN./.i.0.: +   ",
+"y o.OX6Xv.*X>X6 $.1X6X$XG.&.3.T.6X*XY.3.` P J L ;Xb.X           ",
+"y S Y.6XoX6Xl.Y T X.k. X6XB._ ~  .C.3X1XZ K J Z.]./.8.          ",
+"y d Y.6X4 m.6XN S @.J H *XL.C 3./ E A.6Xb W *.:XQ.:X].r.O       ",
+"y d Y.6Xp F 4XL.G 5X4X2X6Xc E %X6X2X6Xc.m ! _.Q.`.<X<X:Xt.:     ",
+"y d U 5 a d I 5 s V M x p m ( R B | k n ) !.[.g.;X,X<X<X,Xu.=   ",
+"y d d d d d d A D J K Q ( ,.,.<.<.2.<...'.`.i.- 5.r.g.:X<Xp..   ",
+"y d d d d d d A D J K Q R ( ,.1.+.l.n.{.h.h.h..     $ 3 e.,     ",
+"q r e 7 7 7 7 7 8 8 8 8 i a.n.~.{.{./.d./.:X'.3         .       ",
+"                        ; d.g.p.p.r.2 /.,X:X:Xt.                ",
+"                        @ g.Q.].;Xy.  > /.,X:XQ.*             7X",
+"7X                        f.[.[.'.0.    9.Q.:X:X6.      7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X  r.`.[./.2       q.~.p.2       7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X  7.Q.[.f.*       X 1 o         7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X  , t./.r.#                   7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X  = % % .                 7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X              7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X          7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X",
+"7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X7X"
+};

Modified: branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kaddressbook.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,52 +1,64 @@
-debian/tmp/usr/bin/kabc2mutt
-debian/tmp/usr/bin/kaddressbook
-debian/tmp/usr/lib/kde3/kabc_imap.la
-debian/tmp/usr/lib/kde3/kabc_imap.so
-debian/tmp/usr/lib/kde3/kabc_slox.la
-debian/tmp/usr/lib/kde3/kabc_slox.so
-debian/tmp/usr/lib/kde3/kabc_xmlrpc.la
-debian/tmp/usr/lib/kde3/kabc_xmlrpc.so
-debian/tmp/usr/lib/kde3/kcm_kabconfig.la
-debian/tmp/usr/lib/kde3/kcm_kabconfig.so
-debian/tmp/usr/lib/kde3/kcm_kabcustomfields.la
-debian/tmp/usr/lib/kde3/kcm_kabcustomfields.so
-debian/tmp/usr/lib/kde3/kcm_kabldapconfig.la
-debian/tmp/usr/lib/kde3/kcm_kabldapconfig.so
-debian/tmp/usr/lib/kde3/ldifvcardthumbnail.la
-debian/tmp/usr/lib/kde3/ldifvcardthumbnail.so
-debian/tmp/usr/lib/kde3/libkaddrbk_*.la
-debian/tmp/usr/lib/kde3/libkaddrbk_*.so
-debian/tmp/usr/lib/kde3/libkaddressbookpart.la
-debian/tmp/usr/lib/kde3/libkaddressbookpart.so
-debian/tmp/usr/lib/libkabc_imap.so.0
-debian/tmp/usr/lib/libkabc_imap.so.0.0.0
-debian/tmp/usr/lib/libkabc_slox.so.0
-debian/tmp/usr/lib/libkabc_slox.so.0.0.0
-debian/tmp/usr/lib/libkabc_xmlrpc.so.1
-debian/tmp/usr/lib/libkabc_xmlrpc.so.1.0.0
-debian/tmp/usr/lib/libkabinterfaces.so.1
-debian/tmp/usr/lib/libkabinterfaces.so.1.0.0
-debian/tmp/usr/lib/libkaddressbook.so.0
-debian/tmp/usr/lib/libkaddressbook.so.0.0.0
-debian/tmp/usr/share/applications/kde/kaddressbook.desktop
-debian/tmp/usr/share/apps/kaddressbook
-debian/tmp/usr/share/doc/kde/HTML/en/kaddressbook
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kaddressbook.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kaddressbook.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kaddressbook.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kaddressbook.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kaddressbook.png
-debian/tmp/usr/share/services/kabconfig.desktop
-debian/tmp/usr/share/services/kabcustomfields.desktop
-debian/tmp/usr/share/services/kabldapconfig.desktop
-debian/tmp/usr/share/services/kaddressbook
-debian/tmp/usr/share/services/kresources/kabc
-debian/tmp/usr/share/services/ldifvcardthumbnail.desktop
-debian/tmp/usr/share/servicetypes/dcopaddressbook.desktop
-debian/tmp/usr/share/servicetypes/kaddressbook_contacteditorwidget.desktop
-debian/tmp/usr/share/servicetypes/kaddressbookimprotocol.desktop
-debian/tmp/usr/share/servicetypes/kaddressbook_extension.desktop
-debian/tmp/usr/share/servicetypes/kaddressbook_view.desktop
-debian/tmp/usr/share/servicetypes/kaddressbook_xxport.desktop
-debian/icons/kaddressbook.xpm /usr/share/pixmaps
-debian/icons/kaddressbook-16.xpm /usr/share/pixmaps
+/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
+/usr/lib/kde3/kcm_kabcustomfields.so
+/usr/lib/kde3/kcm_kabldapconfig.la
+/usr/lib/kde3/kcm_kabldapconfig.so
+/usr/lib/kde3/ldifvcardthumbnail.la
+/usr/lib/kde3/ldifvcardthumbnail.so
+/usr/lib/kde3/libkaddrbk_*.la
+/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
+/usr/lib/libkaddressbook.so.0.0.0
+/usr/share/applications/kde/kaddressbook.desktop
+/usr/share/apps/kaddressbook
+/usr/share/doc/kde/HTML/en/kaddressbook
+/usr/share/icons/crystalsvg/128x128/apps/kaddressbook.png
+/usr/share/icons/crystalsvg/16x16/apps/kaddressbook.png
+/usr/share/icons/crystalsvg/32x32/apps/kaddressbook.png
+/usr/share/icons/crystalsvg/48x48/apps/kaddressbook.png
+/usr/share/icons/crystalsvg/64x64/apps/kaddressbook.png
+/usr/share/services/kabconfig.desktop
+/usr/share/services/kabcustomfields.desktop
+/usr/share/services/kabldapconfig.desktop
+/usr/share/services/kaddressbook
+/usr/share/services/kresources/kabc
+/usr/share/services/ldifvcardthumbnail.desktop
+/usr/share/servicetypes/dcopaddressbook.desktop
+/usr/share/servicetypes/kaddressbook_contacteditorwidget.desktop
+/usr/share/servicetypes/kaddressbookimprotocol.desktop
+/usr/share/servicetypes/kaddressbook_extension.desktop
+/usr/share/servicetypes/kaddressbook_view.desktop
+/usr/share/servicetypes/kaddressbook_xxport.desktop
+../icons/kaddressbook.xpm /usr/share/pixmaps
+../icons/kaddressbook-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/kalarm.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kalarm.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kalarm.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,19 +1,16 @@
-debian/tmp/usr/bin/kalarm
-debian/tmp/usr/bin/kalarmd
-debian/tmp/usr/lib/libkalarmd.so.0
-debian/tmp/usr/lib/libkalarmd.so.0.0.0
-debian/tmp/usr/share/applications/kde/kalarm.desktop
-debian/tmp/usr/share/applnk/.hidden/kalarmd.desktop
-debian/tmp/usr/share/applnk/Applications/kalarm.desktop
-debian/tmp/usr/share/apps/kalarm
-debian/tmp/usr/share/autostart/kalarm.tray.desktop
-debian/tmp/usr/share/autostart/kalarmd.autostart.desktop
-debian/tmp/usr/share/doc/kde/HTML/en/kalarm
-debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kalarmd
-debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kalarm.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kalarm.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/actions/kalarm.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kalarm.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kalarm.png
-debian/icons/kalarm.xpm /usr/share/pixmaps
-debian/icons/kalarm-16.xpm /usr/share/pixmaps
+/usr/bin/kalarm
+/usr/bin/kalarmd
+/usr/share/applications/kde/kalarm.desktop
+/usr/share/applnk/.hidden/kalarmd.desktop
+/usr/share/applnk/Applications/kalarm.desktop
+/usr/share/apps/kalarm
+/usr/share/autostart/kalarm.tray.desktop
+/usr/share/autostart/kalarmd.autostart.desktop
+/usr/share/doc/kde/HTML/en/kalarm
+/usr/share/icons/crystalsvg/16x16/actions/kalarm.png
+/usr/share/icons/crystalsvg/16x16/apps/kalarm.png
+/usr/share/icons/crystalsvg/22x22/actions/kalarm.png
+/usr/share/icons/crystalsvg/32x32/apps/kalarm.png
+/usr/share/icons/crystalsvg/48x48/apps/kalarm.png
+../icons/kalarm.xpm /usr/share/pixmaps
+../icons/kalarm-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/kandy.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kandy.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kandy.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,7 +1,7 @@
-debian/tmp/usr/bin/kandy
-debian/tmp/usr/bin/kandy_client
-debian/tmp/usr/share/applications/kde/kandy.desktop
-debian/tmp/usr/share/applnk/Utilities/kandy.desktop
-debian/tmp/usr/share/apps/kandy
-debian/tmp/usr/share/config.kcfg/kandy.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/kandy
+/usr/bin/kandy
+/usr/bin/kandy_client
+/usr/share/applications/kde/kandy.desktop
+/usr/share/applnk/Utilities/kandy.desktop
+/usr/share/apps/kandy
+/usr/share/config.kcfg/kandy.kcfg
+/usr/share/doc/kde/HTML/en/kandy

Modified: branches/kde-3.4.0/packages/kdepim/debian/karm.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/karm.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/karm.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,12 +1,12 @@
-debian/tmp/usr/bin/karm
-debian/tmp/usr/share/applications/kde/karm.desktop
-debian/tmp/usr/share/applnk/Utilities/karm.desktop
-debian/tmp/usr/share/apps/karm
-debian/tmp/usr/share/doc/kde/HTML/en/karm
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/karm.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/karm.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/karm.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/karm.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/karm.png
-debian/icons/karm.xpm /usr/share/pixmaps
-debian/icons/karm-16.xpm /usr/share/pixmaps
+/usr/bin/karm
+/usr/share/applications/kde/karm.desktop
+/usr/share/applnk/Utilities/karm.desktop
+/usr/share/apps/karm
+/usr/share/doc/kde/HTML/en/karm
+/usr/share/icons/crystalsvg/128x128/apps/karm.png
+/usr/share/icons/crystalsvg/16x16/apps/karm.png
+/usr/share/icons/crystalsvg/32x32/apps/karm.png
+/usr/share/icons/crystalsvg/48x48/apps/karm.png
+/usr/share/icons/crystalsvg/64x64/apps/karm.png
+../icons/karm.xpm /usr/share/pixmaps
+../icons/karm-16.xpm /usr/share/pixmaps

Deleted: branches/kde-3.4.0/packages/kdepim/debian/kde.mk

Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,71 +1,75 @@
-debian/tmp/usr/include/kde/KNotesAppIface.h
-debian/tmp/usr/include/kde/KNotesIface.h
-debian/tmp/usr/include/kde/kabc
-debian/tmp/usr/include/kde/calendar
-debian/tmp/usr/include/kde/kaddressbook
-debian/tmp/usr/include/kde/kitchensync
-debian/tmp/usr/include/kde/kmail
-debian/tmp/usr/include/kde/kmailIface.h
-debian/tmp/usr/include/kde/kmailicalIface.h
-debian/tmp/usr/include/kde/kmailpartIface.h
-debian/tmp/usr/include/kde/kontact
-debian/tmp/usr/include/kde/korganizer
-debian/tmp/usr/include/kde/kpilot
-debian/tmp/usr/include/kde/ksharedfile.h
-debian/tmp/usr/include/kde/ktnef
-debian/tmp/usr/lib/kde3/libegroupwarewizard.la
-debian/tmp/usr/lib/kde3/libegroupwarewizard.so
-debian/tmp/usr/lib/kde3/libkolabwizard.la
-debian/tmp/usr/lib/kde3/libkolabwizard.so
-debian/tmp/usr/lib/kde3/libsloxwizard.la
-debian/tmp/usr/lib/kde3/libsloxwizard.so
-debian/tmp/usr/lib/libkabc_imap.la
-debian/tmp/usr/lib/libkabc_imap.so
-debian/tmp/usr/lib/libkabc_slox.la
-debian/tmp/usr/lib/libkabc_slox.so
-debian/tmp/usr/lib/libkabc_xmlrpc.la
-debian/tmp/usr/lib/libkabc_xmlrpc.so
-debian/tmp/usr/lib/libkabinterfaces.la
-debian/tmp/usr/lib/libkabinterfaces.so
-debian/tmp/usr/lib/libkaddressbook.la
-debian/tmp/usr/lib/libkaddressbook.so
-debian/tmp/usr/lib/libkalarmd.la
-debian/tmp/usr/lib/libkalarmd.so
-debian/tmp/usr/lib/libkdenetwork.la
-debian/tmp/usr/lib/libkdenetwork.so
-debian/tmp/usr/lib/libkdepim.la
-debian/tmp/usr/lib/libkdepim.so
-debian/tmp/usr/lib/libkitchensyncui.la
-debian/tmp/usr/lib/libkitchensyncui.so
-debian/tmp/usr/lib/libkmailprivate.la
-debian/tmp/usr/lib/libkmailprivate.so
-debian/tmp/usr/lib/libknodecommon.la
-debian/tmp/usr/lib/libknodecommon.so
-debian/tmp/usr/lib/libknotes_imap.la
-debian/tmp/usr/lib/libknotes_imap.so
-debian/tmp/usr/lib/libknotes_xmlrpc.la
-debian/tmp/usr/lib/libknotes_xmlrpc.so
-debian/tmp/usr/lib/libkonnector.la
-debian/tmp/usr/lib/libkonnector.so
-debian/tmp/usr/lib/libkontact.la
-debian/tmp/usr/lib/libkontact.so
-debian/tmp/usr/lib/libkorganizer.la
-debian/tmp/usr/lib/libkorganizer.so
-debian/tmp/usr/lib/libkorganizer_calendar.la
-debian/tmp/usr/lib/libkorganizer_calendar.so
-debian/tmp/usr/lib/libkorganizer_eventviewer.la
-debian/tmp/usr/lib/libkorganizer_eventviewer.so
-debian/tmp/usr/lib/libkpilot.la
-debian/tmp/usr/lib/libkpilot.so
-debian/tmp/usr/lib/libkpimidentities.la
-debian/tmp/usr/lib/libkpimidentities.so
-debian/tmp/usr/lib/libkpinterfaces.la
-debian/tmp/usr/lib/libkpinterfaces.so
-debian/tmp/usr/lib/libksharedfile.la
-debian/tmp/usr/lib/libksharedfile.so
-debian/tmp/usr/lib/libksync.la
-debian/tmp/usr/lib/libksync.so
-debian/tmp/usr/lib/libksync2.la
-debian/tmp/usr/lib/libksync2.so
-debian/tmp/usr/lib/libktnef.la
-debian/tmp/usr/lib/libktnef.so
+/usr/include/kde/KNotesAppIface.h
+/usr/include/kde/KNotesIface.h
+/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
+/usr/include/kde/kmailicalIface.h
+/usr/include/kde/kmailpartIface.h
+/usr/include/kde/kontact
+/usr/include/kde/korganizer
+/usr/include/kde/kpilot
+/usr/include/kde/libemailfunctions/idmapper.h
+/usr/lib/kde3/libegroupwarewizard.la
+/usr/lib/kde3/libegroupwarewizard.so
+/usr/lib/kde3/libkolabwizard.la
+/usr/lib/kde3/libkolabwizard.so
+/usr/lib/kde3/libsloxwizard.la
+/usr/lib/kde3/libsloxwizard.so
+/usr/lib/libkabckolab.la
+/usr/lib/libkabckolab.so
+/usr/lib/libkabc_groupdav.la
+/usr/lib/libkabc_groupdav.so
+/usr/lib/libkabc_groupwise.la
+/usr/lib/libkabc_groupwise.so
+/usr/lib/libkabc_newexchange.la
+/usr/lib/libkabc_newexchange.so
+/usr/lib/libkabc_slox.la
+/usr/lib/libkabc_slox.so
+/usr/lib/libkabc_xmlrpc.la
+/usr/lib/libkabc_xmlrpc.so
+/usr/lib/libkabinterfaces.la
+/usr/lib/libkabinterfaces.so
+/usr/lib/libkaddressbook.la
+/usr/lib/libkaddressbook.so
+/usr/lib/libkdepim.la
+/usr/lib/libkdepim.so
+/usr/lib/libkitchensyncui.la
+/usr/lib/libkitchensyncui.so
+/usr/lib/libkmailprivate.la
+/usr/lib/libkmailprivate.so
+/usr/lib/libknodecommon.la
+/usr/lib/libknodecommon.so
+/usr/lib/libknoteskolab.la
+/usr/lib/libknoteskolab.so
+/usr/lib/libknotes_xmlrpc.la
+/usr/lib/libknotes_xmlrpc.so
+/usr/lib/libkocorehelper.la
+/usr/lib/libkocorehelper.so
+/usr/lib/libkonnector.la
+/usr/lib/libkonnector.so
+/usr/lib/libkontact.la
+/usr/lib/libkontact.so
+/usr/lib/libkorganizer.la
+/usr/lib/libkorganizer.so
+/usr/lib/libkorganizer_calendar.la
+/usr/lib/libkorganizer_calendar.so
+/usr/lib/libkorganizer_eventviewer.la
+/usr/lib/libkorganizer_eventviewer.so
+/usr/lib/libkorg_stdprinting.la
+/usr/lib/libkorg_stdprinting.so
+/usr/lib/libkpilot.la
+/usr/lib/libkpilot.so
+/usr/lib/libkpimidentities.la
+/usr/lib/libkpimidentities.so
+/usr/lib/libkpinterfaces.la
+/usr/lib/libkpinterfaces.so
+/usr/lib/libksync.la
+/usr/lib/libksync.so
+/usr/lib/libksync2.la
+/usr/lib/libksync2.so
+/usr/lib/libmultisynk.la
+/usr/lib/libmultisynk.so

Deleted: branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc-html.doc-base.kcontrol-kalarmd

Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1 +1 @@
-debian/tmp/usr/share/doc/kde/HTML/en/kdepim-apidocs/*
+/usr/share/doc/kde/HTML/en/kdepim-apidocs/*

Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-kfile-plugins.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-kfile-plugins.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-kfile-plugins.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,6 +1,9 @@
-debian/tmp/usr/lib/kde3/kfile_palm.la
-debian/tmp/usr/lib/kde3/kfile_palm.so
-debian/tmp/usr/lib/kde3/kfile_vcf.la
-debian/tmp/usr/lib/kde3/kfile_vcf.so
-debian/tmp/usr/share/services/kfile_palm.desktop
-debian/tmp/usr/share/services/kfile_vcf.desktop
+/usr/lib/kde3/kfile_ics.la
+/usr/lib/kde3/kfile_ics.so
+/usr/lib/kde3/kfile_palm.la
+/usr/lib/kde3/kfile_palm.so
+/usr/lib/kde3/kfile_vcf.la
+/usr/lib/kde3/kfile_vcf.so
+/usr/share/services/kfile_ics.desktop
+/usr/share/services/kfile_palm.desktop
+/usr/share/services/kfile_vcf.desktop

Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-kio-plugins.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-kio-plugins.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-kio-plugins.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,8 +1,15 @@
-debian/tmp/usr/lib/kde3/kio_newimap4.la
-debian/tmp/usr/lib/kde3/kio_newimap4.so
-debian/tmp/usr/lib/kde3/kio_sieve.la
-debian/tmp/usr/lib/kde3/kio_sieve.so
-debian/tmp/usr/share/services/newimap4.protocol
-debian/tmp/usr/share/services/newimaps.protocol
-debian/tmp/usr/share/services/overview.desktop
-debian/tmp/usr/share/services/sieve.protocol
+/usr/lib/kde3/kio_groupwise.la
+/usr/lib/kde3/kio_groupwise.so
+/usr/lib/kde3/kio_imap4.la
+/usr/lib/kde3/kio_imap4.so
+/usr/lib/kde3/kio_mbox.la
+/usr/lib/kde3/kio_mbox.so
+/usr/lib/kde3/kio_sieve.la
+/usr/lib/kde3/kio_sieve.so
+/usr/share/services/groupwise.protocol
+/usr/share/services/groupwises.protocol
+/usr/share/services/imap4.protocol
+/usr/share/services/imaps.protocol
+/usr/share/services/mbox.protocol
+/usr/share/services/overview.desktop
+/usr/share/services/sieve.protocol

Modified: branches/kde-3.4.0/packages/kdepim/debian/kdepim-wizards.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-wizards.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-wizards.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,13 +1,14 @@
-debian/tmp/usr/bin/egroupwarewizard
-debian/tmp/usr/bin/groupwarewizard
-debian/tmp/usr/bin/kolabwizard
-debian/tmp/usr/bin/sloxwizard
-debian/tmp/usr/lib/kde3/libegroupwarewizard.so.0
-debian/tmp/usr/lib/kde3/libegroupwarewizard.so.0.0.0
-debian/tmp/usr/lib/kde3/libkolabwizard.so.0
-debian/tmp/usr/lib/kde3/libkolabwizard.so.0.0.0
-debian/tmp/usr/lib/kde3/libsloxwizard.so.0
-debian/tmp/usr/lib/kde3/libsloxwizard.so.0.0.0
-debian/tmp/usr/share/config.kcfg/egroupware.kcfg
-debian/tmp/usr/share/config.kcfg/kolab.kcfg
-debian/tmp/usr/share/config.kcfg/slox.kcfg
+/usr/bin/egroupwarewizard
+/usr/bin/exchangewizard
+/usr/bin/groupwarewizard
+/usr/bin/groupwisewizard
+/usr/bin/kolabwizard
+/usr/bin/sloxwizard
+/usr/lib/kde3/libexchangewizard.la
+/usr/lib/kde3/libexchangewizard.so
+/usr/lib/kde3/libgroupwisewizard.la
+/usr/lib/kde3/libgroupwisewizard.so
+/usr/share/config.kcfg/egroupware.kcfg
+/usr/share/config.kcfg/groupwise.kcfg
+/usr/share/config.kcfg/kolab.kcfg
+/usr/share/config.kcfg/slox.kcfg

Modified: branches/kde-3.4.0/packages/kdepim/debian/kitchensync.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kitchensync.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kitchensync.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,45 +1,54 @@
-debian/tmp/usr/bin/kitchensync
-debian/tmp/usr/lib/kde3/libkded_ksharedfile.la
-debian/tmp/usr/lib/kde3/libkded_ksharedfile.so
-debian/tmp/usr/lib/kde3/libkitchensyncpart.la
-debian/tmp/usr/lib/kde3/libkitchensyncpart.so
-debian/tmp/usr/lib/kde3/libksync_backup.la
-debian/tmp/usr/lib/kde3/libksync_backup.so
-debian/tmp/usr/lib/kde3/libksync_debugger.la
-debian/tmp/usr/lib/kde3/libksync_debugger.so
-debian/tmp/usr/lib/kde3/libksync_restore.la
-debian/tmp/usr/lib/kde3/libksync_restore.so
-debian/tmp/usr/lib/kde3/libksync_syncerpart.la
-debian/tmp/usr/lib/kde3/libksync_syncerpart.so
-debian/tmp/usr/lib/kde3/libksync_viewer.la
-debian/tmp/usr/lib/kde3/libksync_viewer.so
-debian/tmp/usr/lib/kde3/liboverviewpart.la
-debian/tmp/usr/lib/kde3/liboverviewpart.so
-debian/tmp/usr/lib/libdummykonnector.la
-debian/tmp/usr/lib/libdummykonnector.so
-debian/tmp/usr/lib/libkabckonnector.la
-debian/tmp/usr/lib/libkabckonnector.so
-debian/tmp/usr/lib/libkcalkonnector.la
-debian/tmp/usr/lib/libkcalkonnector.so
-debian/tmp/usr/lib/libkitchensyncui.so.0
-debian/tmp/usr/lib/libkitchensyncui.so.0.0.0
-debian/tmp/usr/lib/libkonnector.so.0
-debian/tmp/usr/lib/libkonnector.so.0.0.0
-debian/tmp/usr/lib/libksharedfile.so.0
-debian/tmp/usr/lib/libksharedfile.so.0.0.0
-debian/tmp/usr/lib/libksync2.so.0
-debian/tmp/usr/lib/libksync2.so.0.0.0
-debian/tmp/usr/lib/liblocalkonnector.la
-debian/tmp/usr/lib/liblocalkonnector.so
-debian/tmp/usr/lib/libqtopiakonnector.la
-debian/tmp/usr/lib/libqtopiakonnector.so
-debian/tmp/usr/lib/libremotekonnector.la
-debian/tmp/usr/lib/libremotekonnector.so
-debian/tmp/usr/share/apps/kitchensync
-debian/tmp/usr/share/mimelnk/kdedevice/cellphone.desktop
-debian/tmp/usr/share/mimelnk/kdedevice/pda.desktop
-debian/tmp/usr/share/services/kded/ksharedfile.desktop
-debian/tmp/usr/share/services/kitchensync
-debian/tmp/usr/share/services/kresources/konnector
-debian/tmp/usr/share/servicetypes/kitchensync.desktop
-debian/tmp/usr/share/servicetypes/konnector.desktop
+/usr/bin/kitchensync
+/usr/bin/multisynk
+/usr/lib/kde3/libkitchensyncpart.la
+/usr/lib/kde3/libkitchensyncpart.so
+/usr/lib/kde3/libksync_backup.la
+/usr/lib/kde3/libksync_backup.so
+/usr/lib/kde3/libksync_debugger.la
+/usr/lib/kde3/libksync_debugger.so
+/usr/lib/kde3/libksync_restore.la
+/usr/lib/kde3/libksync_restore.so
+/usr/lib/kde3/libksync_pluckerpart.la
+/usr/lib/kde3/libksync_pluckerpart.so
+/usr/lib/kde3/libksync_syncerpart.la
+/usr/lib/kde3/libksync_syncerpart.so
+/usr/lib/kde3/libksync_viewer.la
+/usr/lib/kde3/libksync_viewer.so
+/usr/lib/kde3/libmultisynkpart.la
+/usr/lib/kde3/libmultisynkpart.so
+/usr/lib/kde3/liboverviewpart.la
+/usr/lib/kde3/liboverviewpart.so
+/usr/lib/libkabckonnector.la
+/usr/lib/libkabckonnector.so
+/usr/lib/libkcalkonnector.la
+/usr/lib/libkcalkonnector.so
+/usr/lib/libkitchensyncui.so.0
+/usr/lib/libkitchensyncui.so.0.0.0
+/usr/lib/libkonnector.so.0
+/usr/lib/libkonnector.so.0.0.0
+/usr/lib/libksync2.so.0
+/usr/lib/libksync2.so.0.0.0
+/usr/lib/liblocalkonnector.la
+/usr/lib/liblocalkonnector.so
+/usr/lib/libmultisynk.so.0
+/usr/lib/libmultisynk.so.0.0.0
+/usr/lib/libqtopiakonnector.la
+/usr/lib/libqtopiakonnector.so
+/usr/lib/libremotekonnector.la
+/usr/lib/libremotekonnector.so
+/usr/share/applications/kde/multisynk.desktop
+/usr/share/apps/kitchensync
+/usr/share/apps/konqueror/servicemenus/kitchensync-pluck.desktop
+/usr/share/apps/konqueror/servicemenus/kitchensync-pluck-rdf.desktop
+/usr/share/apps/multisynk
+/usr/share/doc/kde/HTML/en/multisynk
+/usr/share/icons/crystalsvg/16x16/apps/multisynk.png
+/usr/share/icons/crystalsvg/22x22/apps/multisynk.png
+/usr/share/icons/crystalsvg/32x32/apps/multisynk.png
+/usr/share/icons/crystalsvg/48x48/apps/multisynk.png
+/usr/share/services/kitchensync
+/usr/share/services/kresources/konnector
+/usr/share/services/kresources/konnector_manager.desktop
+/usr/share/servicetypes/filter.desktop
+/usr/share/servicetypes/kitchensync.desktop
+/usr/share/servicetypes/konnector.desktop

Modified: branches/kde-3.4.0/packages/kdepim/debian/kleopatra.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kleopatra.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kleopatra.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,10 +1,10 @@
-debian/tmp/usr/bin/kleopatra
-debian/tmp/usr/bin/kwatchgnupg
-debian/tmp/usr/lib/kde3/kcm_kleopatra.la
-debian/tmp/usr/lib/kde3/kcm_kleopatra.so
-debian/tmp/usr/share/applications/kde/kleopatra_import.desktop
-debian/tmp/usr/share/apps/kleopatra
-debian/tmp/usr/share/apps/kwatchgnupg
-debian/tmp/usr/share/doc/kde/HTML/en/kleopatra
-debian/tmp/usr/share/doc/kde/HTML/en/kwatchgnupg
-debian/tmp/usr/share/services/kleopatra_config_*.desktop
+/usr/bin/kleopatra
+/usr/bin/kwatchgnupg
+/usr/lib/kde3/kcm_kleopatra.la
+/usr/lib/kde3/kcm_kleopatra.so
+/usr/share/applications/kde/kleopatra_import.desktop
+/usr/share/apps/kleopatra
+/usr/share/apps/kwatchgnupg
+/usr/share/doc/kde/HTML/en/kleopatra
+/usr/share/doc/kde/HTML/en/kwatchgnupg
+/usr/share/services/kleopatra_config_*.desktop

Modified: branches/kde-3.4.0/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kmail.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kmail.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,52 +1,54 @@
-debian/tmp/etc/kde3/kmail.antispamrc
-debian/tmp/etc/kde3/kmail.antivirusrc
-debian/tmp/usr/bin/kmail
-debian/tmp/usr/bin/kmail_*.sh
-debian/tmp/usr/lib/kde3/kcm_kmail.la
-debian/tmp/usr/lib/kde3/kcm_kmail.so
-debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.la
-debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.so
-debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.la
-debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.so
-debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.la
-debian/tmp/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.so
-debian/tmp/usr/lib/kde3/libkmailpart.la
-debian/tmp/usr/lib/kde3/libkmailpart.so
-debian/tmp/usr/lib/kde3/libkmailpart.so.1
-debian/tmp/usr/lib/kde3/libkmailpart.so.1.0.0
-debian/tmp/usr/lib/libkmailprivate.so.0
-debian/tmp/usr/lib/libkmailprivate.so.0.0.0
-debian/tmp/usr/share/applications/kde/KMail.desktop
-debian/tmp/usr/share/applications/kde/kmail_view.desktop
-debian/tmp/usr/share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.2-misc.sh
-debian/tmp/usr/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
-debian/tmp/usr/share/apps/kconf_update/kmail-3.3-aegypten.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.3-misc.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.3-move-identities.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
-debian/tmp/usr/share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-3.3b1-misc.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-pgpidentity.pl
-debian/tmp/usr/share/apps/kconf_update/kmail-upd-identities.pl
-debian/tmp/usr/share/apps/kconf_update/kmail.upd
-debian/tmp/usr/share/apps/kconf_update/upgrade-signature.pl
-debian/tmp/usr/share/apps/kconf_update/upgrade-transport.pl
-debian/tmp/usr/share/apps/kmail
-debian/tmp/usr/share/config.kcfg/kmail.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/kmail
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kmail.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kmail.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kmail.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kmaillight.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kmail.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kmaillight.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kmail.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kmail.png
-debian/tmp/usr/share/services/kmail_config_*.desktop
-debian/tmp/usr/share/servicetypes/dcopimap.desktop
-debian/tmp/usr/share/servicetypes/dcopmail.desktop
-debian/icons/kmail.xpm /usr/share/pixmaps
-debian/icons/kmail-16.xpm /usr/share/pixmaps
+/etc/kde3/kmail.antispamrc
+/etc/kde3/kmail.antivirusrc
+/usr/bin/kmail
+/usr/bin/kmail_*.sh
+/usr/lib/kde3/kcm_kmail.la
+/usr/lib/kde3/kcm_kmail.so
+/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.la
+/usr/lib/kde3/libkmail_bodypartformatter_application_octetstream.so
+/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.la
+/usr/lib/kde3/libkmail_bodypartformatter_text_calendar.so
+/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.la
+/usr/lib/kde3/libkmail_bodypartformatter_text_vcard.so
+/usr/lib/kde3/libkmail_bodypartformatter_text_xdiff.la
+/usr/lib/kde3/libkmail_bodypartformatter_text_xdiff.so
+/usr/lib/kde3/libkmailpart.la
+/usr/lib/kde3/libkmailpart.so
+/usr/share/applications/kde/KMail.desktop
+/usr/share/applications/kde/kmail_view.desktop
+/usr/share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
+/usr/share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
+/usr/share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
+/usr/share/apps/kconf_update/kmail-3.2-misc.sh
+/usr/share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+/usr/share/apps/kconf_update/kmail-3.3-aegypten.pl
+/usr/share/apps/kconf_update/kmail-3.3-misc.pl
+/usr/share/apps/kconf_update/kmail-3.3-move-identities.pl
+/usr/share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
+/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-pgpidentity.pl
+/usr/share/apps/kconf_update/kmail-upd-identities.pl
+/usr/share/apps/kconf_update/kmail.upd
+/usr/share/apps/kconf_update/upgrade-signature.pl
+/usr/share/apps/kconf_update/upgrade-transport.pl
+/usr/share/apps/kmail
+/usr/share/config.kcfg/custommimeheader.kcfg
+/usr/share/config.kcfg/kmail.kcfg
+/usr/share/config.kcfg/replyphrases.kcfg
+/usr/share/doc/kde/HTML/en/kmail
+/usr/share/icons/crystalsvg/128x128/apps/kmail.png
+/usr/share/icons/crystalsvg/16x16/apps/kmail.png
+/usr/share/icons/crystalsvg/22x22/apps/kmail.png
+/usr/share/icons/crystalsvg/22x22/apps/kmaillight.png
+/usr/share/icons/crystalsvg/32x32/apps/kmail.png
+/usr/share/icons/crystalsvg/32x32/apps/kmaillight.png
+/usr/share/icons/crystalsvg/48x48/apps/kmail.png
+/usr/share/icons/crystalsvg/64x64/apps/kmail.png
+/usr/share/icons/crystalsvg/scalable/apps/kmail.svgz
+/usr/share/services/kmail_config_*.desktop
+/usr/share/servicetypes/dcopimap.desktop
+/usr/share/servicetypes/dcopmail.desktop
+../icons/kmail.xpm /usr/share/pixmaps
+../icons/kmail-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/kmailcvt.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kmailcvt.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kmailcvt.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,8 +1,8 @@
-debian/tmp/usr/bin/kmailcvt
-debian/tmp/usr/share/applnk/Utilities/kmailcvt.desktop
-debian/tmp/usr/share/apps/kmailcvt
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kmailcvt.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kmailcvt.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kmailcvt.png
-debian/icons/kmailcvt.xpm /usr/share/pixmaps
-debian/icons/kmailcvt-16.xpm /usr/share/pixmaps
+/usr/bin/kmailcvt
+/usr/share/applnk/Utilities/kmailcvt.desktop
+/usr/share/apps/kmailcvt
+/usr/share/icons/crystalsvg/16x16/apps/kmailcvt.png
+/usr/share/icons/crystalsvg/32x32/apps/kmailcvt.png
+/usr/share/icons/crystalsvg/48x48/apps/kmailcvt.png
+../icons/kmailcvt.xpm /usr/share/pixmaps
+../icons/kmailcvt-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/knode.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/knode.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/knode.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,26 +1,22 @@
-debian/tmp/usr/bin/knode
-debian/tmp/usr/lib/kde3/kcm_knode.la
-debian/tmp/usr/lib/kde3/kcm_knode.so
-debian/tmp/usr/lib/kde3/libknodepart.la
-debian/tmp/usr/lib/kde3/libknodepart.so
-debian/tmp/usr/lib/kde3/libknodepart.so.1
-debian/tmp/usr/lib/kde3/libknodepart.so.1.0.0
-debian/tmp/usr/lib/libknodecommon.so.0
-debian/tmp/usr/lib/libknodecommon.so.0.0.0
-debian/tmp/usr/share/applications/kde/KNode.desktop
-debian/tmp/usr/share/apps/knode
-debian/tmp/usr/share/doc/kde/HTML/en/knode
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/knode.png
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/knode2.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/knode.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/knode2.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/knode.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/knode2.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/knode.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/knode2.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knode.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knode2.png
-debian/tmp/usr/share/services/knewsservice.protocol
-debian/tmp/usr/share/services/knode_config_*.desktop
-debian/icons/knode.xpm /usr/share/pixmaps
-debian/icons/knode-16.xpm /usr/share/pixmaps
+/usr/bin/knode
+/usr/lib/kde3/kcm_knode.la
+/usr/lib/kde3/kcm_knode.so
+/usr/lib/kde3/libknodepart.la
+/usr/lib/kde3/libknodepart.so
+/usr/share/applications/kde/KNode.desktop
+/usr/share/apps/knode
+/usr/share/doc/kde/HTML/en/knode
+/usr/share/icons/crystalsvg/128x128/apps/knode.png
+/usr/share/icons/crystalsvg/128x128/apps/knode2.png
+/usr/share/icons/crystalsvg/16x16/apps/knode.png
+/usr/share/icons/crystalsvg/16x16/apps/knode2.png
+/usr/share/icons/crystalsvg/32x32/apps/knode.png
+/usr/share/icons/crystalsvg/32x32/apps/knode2.png
+/usr/share/icons/crystalsvg/48x48/apps/knode.png
+/usr/share/icons/crystalsvg/48x48/apps/knode2.png
+/usr/share/icons/crystalsvg/64x64/apps/knode.png
+/usr/share/icons/crystalsvg/64x64/apps/knode2.png
+/usr/share/services/knewsservice.protocol
+/usr/share/services/knode_config_*.desktop
+../icons/knode.xpm /usr/share/pixmaps
+../icons/knode-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/knotes.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/knotes.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/knotes.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,25 +1,26 @@
-debian/tmp/usr/bin/knotes
-debian/tmp/usr/lib/kde3/knotes_imap.la
-debian/tmp/usr/lib/kde3/knotes_imap.so
-debian/tmp/usr/lib/kde3/knotes_local.la
-debian/tmp/usr/lib/kde3/knotes_local.so
-debian/tmp/usr/lib/kde3/knotes_xmlrpc.la
-debian/tmp/usr/lib/kde3/knotes_xmlrpc.so
-debian/tmp/usr/lib/libknotes_imap.so.0
-debian/tmp/usr/lib/libknotes_imap.so.0.0.0
-debian/tmp/usr/lib/libknotes_xmlrpc.so.1
-debian/tmp/usr/lib/libknotes_xmlrpc.so.1.0.0
-debian/tmp/usr/share/applications/kde/knotes.desktop
-debian/tmp/usr/share/apps/knotes
-debian/tmp/usr/share/config.kcfg/knoteconfig.kcfg
-debian/tmp/usr/share/config.kcfg/knotesglobalconfig.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/knotes
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/knotes.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/knotes.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/knotes.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/knotes.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/knotes.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/knotes.png
-debian/tmp/usr/share/services/kresources/knotes
-debian/icons/knotes.xpm /usr/share/pixmaps
-debian/icons/knotes-16.xpm /usr/share/pixmaps
+/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
+/usr/share/config.kcfg/knotesglobalconfig.kcfg
+/usr/share/doc/kde/HTML/en/knotes
+/usr/share/icons/crystalsvg/128x128/apps/knotes.png
+/usr/share/icons/crystalsvg/16x16/apps/knotes.png
+/usr/share/icons/crystalsvg/22x22/apps/knotes.png
+/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_manager.desktop
+../icons/knotes.xpm /usr/share/pixmaps
+../icons/knotes-16.xpm /usr/share/pixmaps

Added: branches/kde-3.4.0/packages/kdepim/debian/kode.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kode.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kode.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,6 @@
+/usr/bin/kode
+/usr/bin/kxml_compiler
+/usr/lib/libkode.la
+/usr/lib/libkode.so
+/usr/lib/libkode.so.1
+/usr/lib/libkode.so.1.0.0

Modified: branches/kde-3.4.0/packages/kdepim/debian/konsolekalendar.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/konsolekalendar.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/konsolekalendar.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,8 +1,8 @@
-debian/tmp/usr/bin/konsolekalendar
-debian/tmp/usr/share/applications/kde/konsolekalendar.desktop
-debian/tmp/usr/share/doc/kde/HTML/en/konsolekalendar/common
-debian/tmp/usr/share/doc/kde/HTML/en/konsolekalendar/index.cache.bz2
-debian/tmp/usr/share/doc/kde/HTML/en/konsolekalendar/index.docbook
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/konsolekalendar.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/konsolekalendar.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/konsolekalendar.png
+/usr/bin/konsolekalendar
+/usr/share/applications/kde/konsolekalendar.desktop
+/usr/share/doc/kde/HTML/en/konsolekalendar/common
+/usr/share/doc/kde/HTML/en/konsolekalendar/index.cache.bz2
+/usr/share/doc/kde/HTML/en/konsolekalendar/index.docbook
+/usr/share/icons/crystalsvg/16x16/apps/konsolekalendar.png
+/usr/share/icons/crystalsvg/22x22/apps/konsolekalendar.png
+/usr/share/icons/crystalsvg/32x32/apps/konsolekalendar.png

Modified: branches/kde-3.4.0/packages/kdepim/debian/kontact.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kontact.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kontact.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,44 +1,49 @@
-debian/tmp/usr/bin/kontact
-debian/tmp/usr/lib/kde3/kcm_kabsummary.la
-debian/tmp/usr/lib/kde3/kcm_kabsummary.so
-debian/tmp/usr/lib/kde3/kcm_kmailsummary.la
-debian/tmp/usr/lib/kde3/kcm_kmailsummary.so
-debian/tmp/usr/lib/kde3/kcm_kontact.la
-debian/tmp/usr/lib/kde3/kcm_kontact.so
-debian/tmp/usr/lib/kde3/kcm_kontactknt.la
-debian/tmp/usr/lib/kde3/kcm_kontactknt.so
-debian/tmp/usr/lib/kde3/kcm_kontactsummary.la
-debian/tmp/usr/lib/kde3/kcm_kontactsummary.so
-debian/tmp/usr/lib/kde3/kcm_korgsummary.la
-debian/tmp/usr/lib/kde3/kcm_korgsummary.so
-debian/tmp/usr/lib/kde3/libkontact_*.la
-debian/tmp/usr/lib/kde3/libkontact_*.so
-debian/tmp/usr/lib/libkontact.so.1
-debian/tmp/usr/lib/libkontact.so.1.0.0
-debian/tmp/usr/lib/libkpinterfaces.so.1
-debian/tmp/usr/lib/libkpinterfaces.so.1.0.0
-debian/tmp/usr/share/applications/kde/Kontact.desktop
-debian/tmp/usr/share/apps/kontact
-debian/tmp/usr/share/apps/kontactsummary/kontactsummary_part.rc
-debian/tmp/usr/share/config.kcfg/kontact.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/kontact
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kontact.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/actions/kontact_*.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kontact.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/actions/kontact_*.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kontact.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/actions/kontact_*.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kontact.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/korganizer_todo.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/actions/kontact_*.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kontact.png
-debian/tmp/usr/share/services/kcmkabsummary.desktop
-debian/tmp/usr/share/services/kcmkmailsummary.desktop
-debian/tmp/usr/share/services/kcmkontactknt.desktop
-debian/tmp/usr/share/services/kcmkontactsummary.desktop
-debian/tmp/usr/share/services/kcmkorgsummary.desktop
-debian/tmp/usr/share/services/kontact
-debian/tmp/usr/share/services/kontactconfig.desktop
-debian/tmp/usr/share/servicetypes/kontactplugin.desktop
-debian/icons/kontact.xpm /usr/share/pixmaps
-debian/icons/kontact-16.xpm /usr/share/pixmaps
+/usr/bin/kontact
+/usr/lib/kde3/kcm_kabsummary.la
+/usr/lib/kde3/kcm_kabsummary.so
+/usr/lib/kde3/kcm_kmailsummary.la
+/usr/lib/kde3/kcm_kmailsummary.so
+/usr/lib/kde3/kcm_kontact.la
+/usr/lib/kde3/kcm_kontact.so
+/usr/lib/kde3/kcm_kontactknt.la
+/usr/lib/kde3/kcm_kontactknt.so
+/usr/lib/kde3/kcm_kontactsummary.la
+/usr/lib/kde3/kcm_kontactsummary.so
+/usr/lib/kde3/kcm_korgsummary.la
+/usr/lib/kde3/kcm_korgsummary.so
+/usr/lib/kde3/kcm_sdsummary.la
+/usr/lib/kde3/kcm_sdsummary.so
+/usr/lib/kde3/libkontact_*.la
+/usr/lib/kde3/libkontact_*.so
+/usr/lib/libkontact.so.1
+/usr/lib/libkontact.so.1.0.0
+/usr/lib/libkpinterfaces.so.1
+/usr/lib/libkpinterfaces.so.1.0.0
+/usr/share/applications/kde/Kontact.desktop
+/usr/share/apps/kontact
+/usr/share/apps/kontactsummary/kontactsummary_part.rc
+/usr/share/config.kcfg/kontact.kcfg
+/usr/share/doc/kde/HTML/en/kontact
+/usr/share/icons/crystalsvg/128x128/apps/kontact.png
+/usr/share/icons/crystalsvg/16x16/actions/kontact_*.png
+/usr/share/icons/crystalsvg/16x16/apps/kontact.png
+/usr/share/icons/crystalsvg/22x22/actions/kontact_*.png
+/usr/share/icons/crystalsvg/22x22/apps/kontact.png
+/usr/share/icons/crystalsvg/32x32/actions/kontact_*.png
+/usr/share/icons/crystalsvg/32x32/apps/kontact.png
+/usr/share/icons/crystalsvg/48x48/actions/kontact_*.png
+/usr/share/icons/crystalsvg/48x48/apps/kontact.png
+/usr/share/icons/crystalsvg/48x48/apps/korganizer_todo.png
+/usr/share/icons/crystalsvg/64x64/actions/kontact_*.png
+/usr/share/icons/crystalsvg/64x64/apps/kontact.png
+/usr/share/services/kcmkabsummary.desktop
+/usr/share/services/kcmkmailsummary.desktop
+/usr/share/services/kcmkontactknt.desktop
+/usr/share/services/kcmkontactsummary.desktop
+/usr/share/services/kcmkorgsummary.desktop
+/usr/share/services/kcmsdsummary.desktop
+/usr/share/services/kontact
+/usr/share/services/kontactconfig.desktop
+/usr/share/servicetypes/kontactplugin.desktop
+../icons/kontact.xpm /usr/share/pixmaps
+../icons/kontact-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-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/korganizer.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,36 +1,42 @@
-debian/tmp/usr/bin/ical2vcal
-debian/tmp/usr/bin/korgac
-debian/tmp/usr/bin/korganizer
-debian/tmp/usr/bin/korganizerIn
-debian/tmp/usr/lib/kde3/kcm_korganizer.la
-debian/tmp/usr/lib/kde3/kcm_korganizer.so
-debian/tmp/usr/lib/kde3/libkorg_*.la
-debian/tmp/usr/lib/kde3/libkorg_*.so
-debian/tmp/usr/lib/kde3/libkorganizerpart.la
-debian/tmp/usr/lib/kde3/libkorganizerpart.so
-debian/tmp/usr/lib/libkorganizer.so.1
-debian/tmp/usr/lib/libkorganizer.so.1.0.0
-debian/tmp/usr/lib/libkorganizer_calendar.so.1
-debian/tmp/usr/lib/libkorganizer_calendar.so.1.0.0
-debian/tmp/usr/lib/libkorganizer_eventviewer.so.1
-debian/tmp/usr/lib/libkorganizer_eventviewer.so.1.0.0
-debian/tmp/usr/share/applications/kde/korganizer.desktop
-debian/tmp/usr/share/apps/korgac
-debian/tmp/usr/share/apps/korganizer
-debian/tmp/usr/share/autostart/korgac.desktop
-debian/tmp/usr/share/config.kcfg/korganizer.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/korganizer
-debian/tmp/usr/share/icons/crystalsvg/128x128/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/korganizer.png
-debian/tmp/usr/share/icons/crystalsvg/64x64/apps/korganizer.png
-debian/tmp/usr/share/services/korganizer_*.desktop
-debian/tmp/usr/share/services/korganizer
-debian/tmp/usr/share/services/webcal.protocol
-debian/tmp/usr/share/servicetypes/calendardecoration.desktop
-debian/tmp/usr/share/servicetypes/calendarplugin.desktop
-debian/tmp/usr/share/servicetypes/dcopcalendar.desktop
-debian/tmp/usr/share/servicetypes/korganizerpart.desktop
-debian/icons/korganizer.xpm /usr/share/pixmaps
-debian/icons/korganizer-16.xpm /usr/share/pixmaps
+/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
+/usr/lib/kde3/libkorg_*.so
+/usr/lib/kde3/libkorganizerpart.la
+/usr/lib/kde3/libkorganizerpart.so
+/usr/lib/libkocorehelper.so.1
+/usr/lib/libkocorehelper.so.1.0.0
+/usr/lib/libkorg_stdprinting.so.1
+/usr/lib/libkorg_stdprinting.so.1.0.0
+/usr/lib/libkorganizer.so.1
+/usr/lib/libkorganizer.so.1.0.0
+/usr/lib/libkorganizer_calendar.so.1
+/usr/lib/libkorganizer_calendar.so.1.0.0
+/usr/lib/libkorganizer_eventviewer.so.1
+/usr/lib/libkorganizer_eventviewer.so.1.0.0
+/usr/share/applications/kde/korganizer.desktop
+/usr/share/apps/kconf_update/korganizer.upd
+/usr/share/apps/korgac
+/usr/share/apps/korganizer
+/usr/share/autostart/korgac.desktop
+/usr/share/config.kcfg/korganizer.kcfg
+/usr/share/doc/kde/HTML/en/korganizer
+/usr/share/icons/crystalsvg/128x128/apps/korganizer.png
+/usr/share/icons/crystalsvg/16x16/apps/korganizer.png
+/usr/share/icons/crystalsvg/32x32/apps/korganizer.png
+/usr/share/icons/crystalsvg/48x48/apps/korganizer.png
+/usr/share/icons/crystalsvg/64x64/apps/korganizer.png
+/usr/share/services/korganizer_*.desktop
+/usr/share/services/korganizer
+/usr/share/services/webcal.protocol
+/usr/share/servicetypes/calendardecoration.desktop
+/usr/share/servicetypes/calendarplugin.desktop
+/usr/share/servicetypes/dcopcalendar.desktop
+/usr/share/servicetypes/korganizerpart.desktop
+/usr/share/servicetypes/korgprintplugin.desktop
+../icons/korganizer.xpm /usr/share/pixmaps
+../icons/korganizer-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/korn.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/korn.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/korn.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,8 +1,10 @@
-debian/tmp/usr/bin/korn
-debian/tmp/usr/share/applications/kde/KOrn.desktop
-debian/tmp/usr/share/doc/kde/HTML/en/korn
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/korn.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/korn.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/korn.png
-debian/icons/korn.xpm /usr/share/pixmaps
-debian/icons/korn-16.xpm /usr/share/pixmaps
+/usr/bin/korn
+/usr/lib/kconf_update_bin/korn-3-4-config_change
+/usr/share/applications/kde/KOrn.desktop
+/usr/share/apps/kconf_update/korn-3-4-config_change.upd
+/usr/share/doc/kde/HTML/en/korn
+/usr/share/icons/crystalsvg/16x16/apps/korn.png
+/usr/share/icons/crystalsvg/32x32/apps/korn.png
+/usr/share/icons/crystalsvg/48x48/apps/korn.png
+../icons/korn.xpm /usr/share/pixmaps
+../icons/korn-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/kpilot.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kpilot.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/kpilot.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,55 +1,58 @@
-debian/tmp/usr/bin/kpalmdoc
-debian/tmp/usr/bin/kpilot
-debian/tmp/usr/bin/kpilotDaemon
-debian/tmp/usr/lib/kde3/conduit_*.la
-debian/tmp/usr/lib/kde3/conduit_*.so
-debian/tmp/usr/lib/kde3/kcm_kpilot.la
-debian/tmp/usr/lib/kde3/kcm_kpilot.so
-debian/tmp/usr/lib/libkpilot.so.0
-debian/tmp/usr/lib/libkpilot.so.0.0.0
-debian/tmp/usr/share/applications/kde/kpalmdoc.desktop
-debian/tmp/usr/share/applications/kde/kpilot.desktop
-debian/tmp/usr/share/applications/kde/kpilotdaemon.desktop
-debian/tmp/usr/share/apps/kconf_update/kpalmdoc.upd
-debian/tmp/usr/share/apps/kconf_update/kpilot.upd
-debian/tmp/usr/share/apps/kpilot
-debian/tmp/usr/share/config.kcfg/abbrowserconduit.kcfg
-debian/tmp/usr/share/config.kcfg/docconduit.kcfg
-debian/tmp/usr/share/config.kcfg/knotesconduit.kcfg
-debian/tmp/usr/share/config.kcfg/kpalmdoc.kcfg
-debian/tmp/usr/share/config.kcfg/kpilot.kcfg
-debian/tmp/usr/share/config.kcfg/kpilotlib.kcfg
-debian/tmp/usr/share/config.kcfg/malconduit.kcfg
-debian/tmp/usr/share/config.kcfg/popmail.kcfg
-debian/tmp/usr/share/config.kcfg/sysinfoconduit.kcfg
-debian/tmp/usr/share/config.kcfg/timeconduit.kcfg
-debian/tmp/usr/share/config.kcfg/vcalconduitbase.kcfg
-debian/tmp/usr/share/doc/kde/HTML/en/kpilot
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpalmdoc.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpilot.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kpalmdoc.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kpilot.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpalmdoc.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpilot.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpalmdoc.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpilot.png
-debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
-debian/tmp/usr/share/icons/locolor/16x16/apps/kpilot.png
-debian/tmp/usr/share/services/abbrowser_conduit.desktop
-debian/tmp/usr/share/services/doc_conduit.desktop
-debian/tmp/usr/share/services/knotes-conduit.desktop
-debian/tmp/usr/share/services/kpilot_config.desktop
-debian/tmp/usr/share/services/mal_conduit.desktop
-debian/tmp/usr/share/services/popmail-conduit.desktop
-debian/tmp/usr/share/services/sysinfo_conduit.desktop
-debian/tmp/usr/share/services/time_conduit.desktop
-debian/tmp/usr/share/services/todo-conduit.desktop
-debian/tmp/usr/share/services/vcal-conduit.desktop
-debian/tmp/usr/share/servicetypes/kpilotconduit.desktop
-debian/icons/kpilot.xpm /usr/share/pixmaps
-debian/icons/kpilot-16.xpm /usr/share/pixmaps
-debian/icons/kpalmdoc.xpm /usr/share/pixmaps
-debian/icons/kpalmdoc-16.xpm /usr/share/pixmaps
+/usr/bin/kpalmdoc
+/usr/bin/kpilot
+/usr/bin/kpilotDaemon
+/usr/lib/kde3/conduit_*.la
+/usr/lib/kde3/conduit_*.so
+/usr/lib/kde3/kcm_kpilot.la
+/usr/lib/kde3/kcm_kpilot.so
+/usr/lib/libkpilot.so.0
+/usr/lib/libkpilot.so.0.0.0
+/usr/share/applications/kde/kpalmdoc.desktop
+/usr/share/applications/kde/kpilot.desktop
+/usr/share/applications/kde/kpilotdaemon.desktop
+/usr/share/apps/kconf_update/kpalmdoc.upd
+/usr/share/apps/kconf_update/kpilot.upd
+/usr/share/apps/kpilot
+/usr/share/config.kcfg/abbrowserconduit.kcfg
+/usr/share/config.kcfg/docconduit.kcfg
+/usr/share/config.kcfg/knotesconduit.kcfg
+/usr/share/config.kcfg/kpalmdoc.kcfg
+/usr/share/config.kcfg/kpilot.kcfg
+/usr/share/config.kcfg/kpilotlib.kcfg
+/usr/share/config.kcfg/malconduit.kcfg
+/usr/share/config.kcfg/memofileconduit.kcfg
+/usr/share/config.kcfg/popmail.kcfg
+/usr/share/config.kcfg/sysinfoconduit.kcfg
+/usr/share/config.kcfg/timeconduit.kcfg
+/usr/share/config.kcfg/vcalconduitbase.kcfg
+/usr/share/doc/kde/HTML/en/kpilot
+/usr/share/icons/crystalsvg/16x16/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/16x16/apps/kpilot.png
+/usr/share/icons/crystalsvg/16x16/apps/kpilotDaemon.png
+/usr/share/icons/crystalsvg/22x22/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/22x22/apps/kpilot.png
+/usr/share/icons/crystalsvg/22x22/apps/kpilotDaemon.png
+/usr/share/icons/crystalsvg/32x32/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/32x32/apps/kpilot.png
+/usr/share/icons/crystalsvg/32x32/apps/kpilotDaemon.png
+/usr/share/icons/crystalsvg/48x48/apps/kpalmdoc.png
+/usr/share/icons/crystalsvg/48x48/apps/kpilot.png
+/usr/share/icons/crystalsvg/48x48/apps/kpilotDaemon.png
+/usr/share/icons/locolor/16x16/apps/kpilot.png
+/usr/share/services/abbrowser_conduit.desktop
+/usr/share/services/doc_conduit.desktop
+/usr/share/services/knotes-conduit.desktop
+/usr/share/services/kpilot_config.desktop
+/usr/share/services/mal_conduit.desktop
+/usr/share/services/memofile-conduit.desktop
+/usr/share/services/notepad-conduit.desktop
+/usr/share/services/popmail-conduit.desktop
+/usr/share/services/sysinfo_conduit.desktop
+/usr/share/services/time_conduit.desktop
+/usr/share/services/todo-conduit.desktop
+/usr/share/services/vcal-conduit.desktop
+/usr/share/servicetypes/kpilotconduit.desktop
+../icons/kpilot.xpm /usr/share/pixmaps
+../icons/kpilot-16.xpm /usr/share/pixmaps
+../icons/kpalmdoc.xpm /usr/share/pixmaps
+../icons/kpalmdoc-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/ksync.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/ksync.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/ksync.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,6 +1,6 @@
-debian/tmp/usr/bin/ksync
-debian/tmp/usr/lib/libksync.so.1
-debian/tmp/usr/lib/libksync.so.1.0.0
-debian/tmp/usr/share/apps/ksync/ksyncui.rc
-debian/icons/ksync.xpm /usr/share/pixmaps
-debian/icons/ksync-16.xpm /usr/share/pixmaps
+/usr/bin/ksync
+/usr/lib/libksync.so.1
+/usr/lib/libksync.so.1.0.0
+/usr/share/apps/ksync/ksyncui.rc
+../icons/ksync.xpm /usr/share/pixmaps
+../icons/ksync-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/ktnef.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/ktnef.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/ktnef.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,12 +1,10 @@
-debian/tmp/usr/bin/ktnef
-debian/tmp/usr/lib/libktnef.so.1
-debian/tmp/usr/lib/libktnef.so.1.0.0
-debian/tmp/usr/share/applications/kde/ktnef.desktop
-debian/tmp/usr/share/apps/ktnef
-debian/tmp/usr/share/doc/kde/HTML/en/ktnef
-debian/tmp/usr/share/icons/hicolor/48x48/apps/ktnef.png
-debian/tmp/usr/share/icons/locolor/16x16/apps/ktnef.png
-debian/tmp/usr/share/icons/locolor/32x32/apps/ktnef.png
-debian/tmp/usr/share/mimelnk/application/ms-tnef.desktop
-debian/icons/ktnef.xpm /usr/share/pixmaps
-debian/icons/ktnef-16.xpm /usr/share/pixmaps
+/usr/bin/ktnef
+/usr/share/applications/kde/ktnef.desktop
+/usr/share/apps/ktnef
+/usr/share/doc/kde/HTML/en/ktnef
+/usr/share/icons/hicolor/48x48/apps/ktnef.png
+/usr/share/icons/locolor/16x16/apps/ktnef.png
+/usr/share/icons/locolor/32x32/apps/ktnef.png
+/usr/share/mimelnk/application/ms-tnef.desktop
+../icons/ktnef.xpm /usr/share/pixmaps
+../icons/ktnef-16.xpm /usr/share/pixmaps

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkcal2-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,13 +1,29 @@
-debian/tmp/usr/include/kde/libkcal
-debian/tmp/usr/lib/libkcal.la
-debian/tmp/usr/lib/libkcal.so
-debian/tmp/usr/lib/libkcal_imap.la
-debian/tmp/usr/lib/libkcal_imap.so
-debian/tmp/usr/lib/libkcal_resourceremote.la
-debian/tmp/usr/lib/libkcal_resourceremote.so
-debian/tmp/usr/lib/libkcal_slox.la
-debian/tmp/usr/lib/libkcal_slox.so
-debian/tmp/usr/lib/libkcal_xmlrpc.la
-debian/tmp/usr/lib/libkcal_xmlrpc.so
-debian/tmp/usr/lib/libkslox.la
-debian/tmp/usr/lib/libkslox.so
+/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-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkcal2a.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,15 +1,33 @@
-debian/tmp/usr/lib/kde3/kcal_*.la
-debian/tmp/usr/lib/kde3/kcal_*.so
-debian/tmp/usr/lib/libkcal.so.2
-debian/tmp/usr/lib/libkcal.so.2.0.0
-debian/tmp/usr/lib/libkcal_imap.so.1
-debian/tmp/usr/lib/libkcal_imap.so.1.0.0
-debian/tmp/usr/lib/libkcal_resourceremote.so.1
-debian/tmp/usr/lib/libkcal_resourceremote.so.1.0.0
-debian/tmp/usr/lib/libkcal_slox.so.0
-debian/tmp/usr/lib/libkcal_slox.so.0.0.0
-debian/tmp/usr/lib/libkcal_xmlrpc.so.1
-debian/tmp/usr/lib/libkcal_xmlrpc.so.1.0.0
-debian/tmp/usr/lib/libkslox.so.0
-debian/tmp/usr/lib/libkslox.so.0.0.0
-debian/tmp/usr/share/services/kresources/kcal
+/usr/lib/kde3/kcal_*.la
+/usr/lib/kde3/kcal_*.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_manager.desktop

Deleted: branches/kde-3.4.0/packages/kdepim/debian/libkdenetwork2.install

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkdepim1.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkdepim1.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkdepim1.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,2 +1,9 @@
-debian/tmp/usr/lib/libkdepim.so.1
-debian/tmp/usr/lib/libkdepim.so.1.0.0
+/usr/lib/kde3/plugins/designer/kdepimwidgets.la
+/usr/lib/kde3/plugins/designer/kdepimwidgets.so
+/usr/lib/kde3/plugins/designer/kpartsdesignerplugin.la
+/usr/lib/kde3/plugins/designer/kpartsdesignerplugin.so
+/usr/lib/libkdepim.so.1
+/usr/lib/libkdepim.so.1.0.0
+/usr/share/apps/kdepimwidgets
+/usr/share/apps/libkdepim
+/usr/share/config.kcfg/pimemoticons.kcfg

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkgantt0-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkgantt0-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkgantt0-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/kde/kgantt
-debian/tmp/usr/lib/libkgantt.la
-debian/tmp/usr/lib/libkgantt.so
+/usr/include/kde/kgantt
+/usr/lib/libkgantt.la
+/usr/lib/libkgantt.so

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkgantt0.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkgantt0.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkgantt0.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libkgantt.so.0
-debian/tmp/usr/lib/libkgantt.so.0.0.2
-debian/tmp/usr/share/apps/kgantt
+/usr/lib/libkgantt.so.0
+/usr/lib/libkgantt.so.0.0.2
+/usr/share/apps/kgantt

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,9 +1,11 @@
-debian/tmp/usr/include/kde/gpgme++
-debian/tmp/usr/include/kde/kleo
-debian/tmp/usr/include/kde/qgpgme
-debian/tmp/usr/lib/libgpgme++.la
-debian/tmp/usr/lib/libgpgme++.so
-debian/tmp/usr/lib/libkleopatra.la
-debian/tmp/usr/lib/libkleopatra.so
-debian/tmp/usr/lib/libqgpgme.la
-debian/tmp/usr/lib/libqgpgme.so
+/usr/include/kde/gpgme++
+/usr/include/kde/kleo
+/usr/include/kde/qgpgme
+/usr/lib/libgpgme++.la
+/usr/lib/libgpgme++.so
+/usr/lib/libkleopatra.la
+/usr/lib/libkleopatra.so
+/usr/lib/libkpgp.la
+/usr/lib/libkpgp.so
+/usr/lib/libqgpgme.la
+/usr/lib/libqgpgme.so

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkleopatra0a.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,14 +1,18 @@
-debian/tmp/etc/kde3/libkleopatrarc
-debian/tmp/usr/lib/libgpgme++.so.0
-debian/tmp/usr/lib/libgpgme++.so.0.1.0
-debian/tmp/usr/lib/libkleopatra.so.0
-debian/tmp/usr/lib/libkleopatra.so.0.0.0
-debian/tmp/usr/lib/libqgpgme.so.0
-debian/tmp/usr/lib/libqgpgme.so.0.0.0
-debian/tmp/usr/share/apps/libkleopatra
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gpg.png
-debian/tmp/usr/share/icons/crystalsvg/16x16/apps/gpgsm.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/gpg.png
-debian/tmp/usr/share/icons/crystalsvg/22x22/apps/gpgsm.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gpg.png
-debian/tmp/usr/share/icons/crystalsvg/32x32/apps/gpgsm.png
+/etc/kde3/libkleopatrarc
+/usr/lib/libgpgme++.so.0
+/usr/lib/libgpgme++.so.0.1.0
+/usr/lib/libkleopatra.so.0
+/usr/lib/libkleopatra.so.0.0.0
+/usr/lib/libkpgp.so.2
+/usr/lib/libkpgp.so.2.2.0
+/usr/lib/libqgpgme.so.0
+/usr/lib/libqgpgme.so.0.0.0
+/usr/share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
+/usr/share/apps/kconf_update/kpgp.upd
+/usr/share/apps/libkleopatra
+/usr/share/icons/crystalsvg/16x16/apps/gpg.png
+/usr/share/icons/crystalsvg/16x16/apps/gpgsm.png
+/usr/share/icons/crystalsvg/22x22/apps/gpg.png
+/usr/share/icons/crystalsvg/22x22/apps/gpgsm.png
+/usr/share/icons/crystalsvg/32x32/apps/gpg.png
+/usr/share/icons/crystalsvg/32x32/apps/gpgsm.png

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,4 +1,4 @@
-debian/tmp/usr/include/kde/kdepim/exchangeaccount.h
-debian/tmp/usr/include/kde/kdepim/exchangeclient.h
-debian/tmp/usr/lib/libkpimexchange.la
-debian/tmp/usr/lib/libkpimexchange.so
+/usr/include/kde/kdepim/exchangeaccount.h
+/usr/include/kde/kdepim/exchangeclient.h
+/usr/lib/libkpimexchange.la
+/usr/lib/libkpimexchange.so

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkpimexchange1.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/kde3/resourcecalendarexchange.la
-debian/tmp/usr/lib/kde3/resourcecalendarexchange.so
-debian/tmp/usr/lib/libkpimexchange.so.1
-debian/tmp/usr/lib/libkpimexchange.so.1.0.0
+/usr/lib/kde3/resourcecalendarexchange.la
+/usr/lib/kde3/resourcecalendarexchange.so
+/usr/lib/libkpimexchange.so.1
+/usr/lib/libkpimexchange.so.1.0.0

Modified: branches/kde-3.4.0/packages/kdepim/debian/libkpimidentities1.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libkpimidentities1.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libkpimidentities1.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libkpimidentities.so.1
-debian/tmp/usr/lib/libkpimidentities.so.1.0.0
+/usr/lib/libkpimidentities.so.1
+/usr/lib/libkpimidentities.so.1.0.0

Modified: branches/kde-3.4.0/packages/kdepim/debian/libksieve0-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libksieve0-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libksieve0-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/kde/ksieve
-debian/tmp/usr/lib/libksieve.la
-debian/tmp/usr/lib/libksieve.so
+/usr/include/kde/ksieve
+/usr/lib/libksieve.la
+/usr/lib/libksieve.so

Modified: branches/kde-3.4.0/packages/kdepim/debian/libksieve0.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libksieve0.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libksieve0.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libksieve.so.0
-debian/tmp/usr/lib/libksieve.so.0.0.0
+/usr/lib/libksieve.so.0
+/usr/lib/libksieve.so.0.0.0

Added: branches/kde-3.4.0/packages/kdepim/debian/libktnef1-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libktnef1-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libktnef1-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,3 @@
+/usr/include/kde/ktnef
+/usr/lib/libktnef.la
+/usr/lib/libktnef.so

Added: branches/kde-3.4.0/packages/kdepim/debian/libktnef1.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libktnef1.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libktnef1.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,2 @@
+/usr/lib/libktnef.so.1
+/usr/lib/libktnef.so.1.0.0

Modified: branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libmimelib1-dev.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,3 +1,5 @@
-debian/tmp/usr/include/kde/mimelib
-debian/tmp/usr/lib/libmimelib.la
-debian/tmp/usr/lib/libmimelib.so
+/usr/include/kde/mimelib
+/usr/lib/libkmime.la
+/usr/lib/libkmime.so
+/usr/lib/libmimelib.la
+/usr/lib/libmimelib.so

Modified: branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/libmimelib1a.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,2 +1,4 @@
-debian/tmp/usr/lib/libmimelib.so.1
-debian/tmp/usr/lib/libmimelib.so.1.0.1
+/usr/lib/libkmime.so.2
+/usr/lib/libkmime.so.2.2.0
+/usr/lib/libmimelib.so.1
+/usr/lib/libmimelib.so.1.0.1

Added: branches/kde-3.4.0/packages/kdepim/debian/networkstatus.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/networkstatus.install	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/networkstatus.install	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,4 @@
+/usr/bin/networkstatustestservice
+/usr/lib/kde3/kded_networkstatus.la
+/usr/lib/kde3/kded_networkstatus.so
+/usr/share/services/kded/networkstatus.desktop


Property changes on: branches/kde-3.4.0/packages/kdepim/debian/patches
___________________________________________________________________
Name: svn:externals
   + common svn://svn.debian.org/pkg-kde/branches/kde-3.4.0/common-patches


Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch.diff

Copied: branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff (from rev 716, branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch.diff)
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch.diff	2005-03-06 06:13:34 UTC (rev 716)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/01_kdepim_branch_20050305.diff	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,433 @@
+Index: admin/am_edit
+===================================================================
+RCS file: /home/kde/kde-common/admin/am_edit,v
+retrieving revision 1.412
+retrieving revision 1.412.6.2
+diff -u -d -r1.412 -r1.412.6.2
+--- admin/am_edit	17 Dec 2004 20:18:28 -0000	1.412
++++ admin/am_edit	1 Mar 2005 18:46:09 -0000	1.412.6.2
+@@ -483,6 +483,7 @@
+             $MakefileData =~ s/$lookup/$replacement/;
+             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
+             $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
++            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
+             substituteLine($lookup, $replacement);
+         } else {
+             $found = 0;
+@@ -2276,7 +2277,7 @@
+            "\t        echo \"\$\$i\"; \\\n" . 
+            "\t        if ! ";
+     $t .=  $cxxsuffix eq "KKK" ?
+-           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
++           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
+            "\$(CXXCOMPILE) ";
+     $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
+            "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
+@@ -2352,7 +2353,7 @@
+     $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
+     # Append our $progId line, _below_ the "generated by automake" line
+     # because automake-1.6 relies on the first line to be his own.
+-    my $progIdLine = "\# $progId - " . '$Revision: 1.412 $ '."\n";
++    my $progIdLine = "\# $progId - " . '$Revision: 1.412.6.2 $ '."\n";
+     if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
+         warn "automake line not found in $makefile\n";
+ 	# Fallback: first line
+Index: akregator/src/akregator_part.cpp
+===================================================================
+RCS file: /home/kde/kdepim/akregator/src/akregator_part.cpp,v
+retrieving revision 1.151.6.1
+retrieving revision 1.151.6.2
+diff -u -d -r1.151.6.1 -r1.151.6.2
+--- akregator/src/akregator_part.cpp	2 Mar 2005 21:27:31 -0000	1.151.6.1
++++ akregator/src/akregator_part.cpp	5 Mar 2005 09:47:29 -0000	1.151.6.2
+@@ -202,10 +202,10 @@
+     if ( isTrayIconEnabled() )
+     {
+         m_trayIcon->show();
+-        NotificationManager::self()->setWidget(m_trayIcon);
++        NotificationManager::self()->setWidget(m_trayIcon, instance());
+     }
+     else
+-        NotificationManager::self()->setWidget(getMainWindow());
++        NotificationManager::self()->setWidget(getMainWindow(), instance());
+ 
+     connect( m_trayIcon, SIGNAL(quitSelected()),
+             kapp, SLOT(quit())) ;
+@@ -240,7 +240,7 @@
+ 
+ void Part::slotSettingsChanged()
+ {
+-    NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_trayIcon : getMainWindow());
++    NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_trayIcon : getMainWindow(), instance());
+ 
+     RSS::FileRetriever::setUseCache(Settings::useHTMLCache());
+     
+Index: akregator/src/notificationmanager.cpp
+===================================================================
+RCS file: /home/kde/kdepim/akregator/src/notificationmanager.cpp,v
+retrieving revision 1.2.6.1
+retrieving revision 1.2.6.2
+diff -u -d -r1.2.6.1 -r1.2.6.2
+--- akregator/src/notificationmanager.cpp	2 Mar 2005 21:27:31 -0000	1.2.6.1
++++ akregator/src/notificationmanager.cpp	5 Mar 2005 09:47:29 -0000	1.2.6.2
+@@ -44,6 +44,7 @@
+     m_addedInLastInterval = false;
+     m_maxArticles = 20;
+     m_widget = NULL;
++    m_instance = NULL;
+ }
+ 
+ NotificationManager::~NotificationManager()
+@@ -51,9 +52,10 @@
+     m_self = 0;
+ }
+ 
+-void NotificationManager::setWidget(QWidget* widget)
++void NotificationManager::setWidget(QWidget* widget, KInstance* inst)
+ {
+     m_widget = widget;
++    m_instance = inst != NULL ? inst : KGlobal::instance();
+ }
+ 
+ void NotificationManager::slotNotifyArticle(const MyArticle& article)
+@@ -73,6 +75,7 @@
+ {
+     if (feeds.count() == 1)
+     {
++        KNotifyClient::Instance inst(m_instance);
+         KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0]));
+     }
+     else if (feeds.count() > 1)
+@@ -80,6 +83,7 @@
+         QString message;
+         for (QStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it)
+             message += *it + "\n";
++        KNotifyClient::Instance inst(m_instance);
+         KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
+     }
+ }
+@@ -100,6 +104,7 @@
+         message += (*it).title() + "<br>";
+     }
+     message += "</body></html>";
++    KNotifyClient::Instance inst(m_instance);
+     KNotifyClient::event(m_widget->winId(), "new_articles", message);
+ 
+     m_articles.clear();
+Index: akregator/src/notificationmanager.h
+===================================================================
+RCS file: /home/kde/kdepim/akregator/src/notificationmanager.h,v
+retrieving revision 1.1.6.1
+retrieving revision 1.1.6.2
+diff -u -d -r1.1.6.1 -r1.1.6.2
+--- akregator/src/notificationmanager.h	2 Mar 2005 21:27:31 -0000	1.1.6.1
++++ akregator/src/notificationmanager.h	5 Mar 2005 09:47:29 -0000	1.1.6.2
+@@ -43,7 +43,7 @@
+         ~NotificationManager();
+ 
+         /** the widget used for notification, normally either the mainwindow or the tray icon */
+-        void setWidget(QWidget* widget);
++        void setWidget(QWidget* widget, KInstance* inst=0);
+         
+     public slots:
+ 
+@@ -73,7 +73,8 @@
+         bool m_running;
+         bool m_addedInLastInterval;
+         QWidget* m_widget;
+-        
++        KInstance* m_instance;
++
+         QValueList<MyArticle> m_articles;
+ 
+         static NotificationManager* m_self;
+Index: kalarm/prefdlg.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/prefdlg.cpp,v
+retrieving revision 1.61
+retrieving revision 1.61.2.3
+diff -u -d -r1.61 -r1.61.2.3
+--- kalarm/prefdlg.cpp	7 Feb 2005 01:13:02 -0000	1.61
++++ kalarm/prefdlg.cpp	4 Mar 2005 22:06:18 -0000	1.61.2.3
+@@ -442,10 +442,13 @@
+ 	setExpiredControls(preferences->mExpiredKeepDays);
+ 	QString xtermCmd = preferences->cmdXTermCommand();
+ 	int id = 0;
+-	for ( ;  id < mXtermCount;  ++id)
++	if (!xtermCmd.isEmpty())
+ 	{
+-		if (mXtermType->find(id)  &&  xtermCmd == xtermCommands[id])
+-			break;
++		for ( ;  id < mXtermCount;  ++id)
++		{
++			if (mXtermType->find(id)  &&  xtermCmd == xtermCommands[id])
++				break;
++		}
+ 	}
+ 	mXtermType->setButton(id);
+ 	mXtermCommand->setEnabled(id == mXtermCount);
+@@ -455,6 +458,28 @@
+ 
+ void MiscPrefTab::apply(bool syncToDisc)
+ {
++	// First validate anything entered in Other X-terminal command
++	int xtermID = mXtermType->selectedId();
++	if (xtermID >= mXtermCount)
++	{
++		QString cmd = mXtermCommand->text();
++		if (cmd.isEmpty())
++			xtermID = 0;       // 'Other' is only acceptable if it's non-blank
++		else
++		{
++			int i = cmd.find(' ');    // find the end of the terminal window name
++			if (i > 0)
++				cmd = cmd.left(i);
++			if (KStandardDirs::findExe(cmd).isEmpty())
++			{
++				mXtermCommand->setFocus();
++// This string should be translated, but there is a message freeze...
++				if (KMessageBox::warningContinueCancel(this, QString("Command to invoke terminal window not found:\n%1").arg(cmd))
++					        != KMessageBox::Continue)
++					return;
++			}
++		}
++	}
+ 	Preferences* preferences = Preferences::instance();
+ 	preferences->mAutostartDaemon = mAutostartDaemon->isChecked();
+ 	bool systray = mRunInSystemTray->isChecked();
+@@ -470,8 +495,7 @@
+ 	preferences->mFeb29RecurType  = (feb29 >= 0) ? Preferences::Feb29Type(feb29) : Preferences::default_feb29RecurType;
+ 	preferences->mExpiredKeepDays = !mKeepExpired->isChecked() ? 0
+ 	                              : mPurgeExpired->isChecked() ? mPurgeAfter->value() : -1;
+-	int id = mXtermType->selectedId();
+-	preferences->mCmdXTermCommand = (id < mXtermCount) ? xtermCommands[id] : mXtermCommand->text();
++	preferences->mCmdXTermCommand = (xtermID < mXtermCount) ? xtermCommands[xtermID] : mXtermCommand->text();
+ 	PrefsTabBase::apply(syncToDisc);
+ }
+ 
+Index: kalarm/widgets/label.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/widgets/label.h,v
+retrieving revision 1.1
+retrieving revision 1.1.2.1
+diff -u -d -r1.1 -r1.1.2.1
+--- kalarm/widgets/label.h	23 Oct 2004 12:36:28 -0000	1.1
++++ kalarm/widgets/label.h	4 Mar 2005 20:21:51 -0000	1.1.2.1
+@@ -25,15 +25,52 @@
+ class QRadioButton;
+ 
+ 
++/**
++ *  The Label class provides a text display, with special behaviour when a radio
++ *  button is set as a buddy.
++ *
++ *  The Label object in effect acts as if it were part of the buddy radio button,
++ *  in that when the label's accelerator key is pressed, the radio button receives
++ *  focus and is switched on. When a non-radio button is specified as a buddy, the
++ *  behaviour is the same as for QLabel.
++ *
++ *  @short QLabel with option for a buddy radio button.
++ *  @author David Jarvie <software@astrojar.org.uk>
++ */
+ class Label : public QLabel
+ {
+ 		Q_OBJECT
+ 		friend class LabelFocusWidget;
+ 	public:
+-		Label(QWidget* parent, const char* name = 0, WFlags = 0);
++		/** Constructs an empty label.
++		 *  @param parent The parent object of this widget.
++		 *  @param name The name of this widget.
++		 *  @param f    @see QWidget constructor for details.
++		 */
++		Label(QWidget* parent, const char* name = 0, WFlags f = 0);
++		/** Constructs a label that displays @p text.
++		 *  @param text   Text string to display.
++		 *  @param parent The parent object of this widget.
++		 *  @param name   The name of this widget.
++		 *  @param f      @see QWidget constructor for details.
++		 */
+ 		Label(const QString& text, QWidget* parent, const char* name = 0, WFlags = 0);
++		/** Constructs a label, with a buddy widget, that displays @p text.
++		 *  @param buddy  Buddy widget which receives the keyboard focus when the
++		 *                label's accelerator key is pressed. If @p buddy is a radio
++		 *                button, @p buddy is in addition selected when the
++		 *                accelerator key is pressed.
++		 *  @param text   Text string to display.
++		 *  @param parent The parent object of this widget.
++		 *  @param name   The name of this widget.
++		 *  @param f      @see QWidget constructor for details.
++		 */
+ 		Label(QWidget* buddy, const QString& text, QWidget* parent, const char* name = 0, WFlags = 0);
+-		virtual void      setBuddy(QWidget*);
++		/** Sets the label's buddy widget which receives the keyboard focus when the
++		 *  label's accelerator key is pressed. If @p buddy is a radio button,
++		 *  @p buddy is in addition selected when the accelerator key is pressed.
++		 */
++		virtual void      setBuddy(QWidget* buddy);
+ 	protected:
+ 		virtual void      drawContents(QPainter* p)  { QLabel::drawContents(p); }
+ 	private slots:
+@@ -45,6 +82,7 @@
+ };
+ 
+ 
++// Private class for use by Label
+ class LabelFocusWidget : public QWidget
+ {
+ 		Q_OBJECT
+Index: kalarm/widgets/timeedit.h
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/widgets/timeedit.h,v
+retrieving revision 1.1
+retrieving revision 1.1.2.1
+diff -u -d -r1.1 -r1.1.2.1
+--- kalarm/widgets/timeedit.h	18 Nov 2004 13:36:01 -0000	1.1
++++ kalarm/widgets/timeedit.h	4 Mar 2005 20:21:51 -0000	1.1.2.1
+@@ -28,29 +28,81 @@
+ class TimeSpinBox;
+ 
+ 
++/**
++ *  The TimeEdit class provides a widget to enter a time of day in hours and minutes,
++ *  using a 12- or 24-hour clock according to the user's locale settings.
++ *
++ *  It displays a TimeSpinBox widget to enter hours and minutes. If a 12-hour clock is
++ *  being used, it also displays a combo box to select am or pm.
++ *
++ *  TimeSpinBox displays a spin box with two pairs of spin buttons, one for hours and
++ *  one for minutes. It provides accelerated stepping using the spin buttons, when the
++ *  shift key is held down (inherited from SpinBox2). The default shift steps are 5
++ *  minutes and 6 hours.
++ *
++ *  The widget may be set as read-only. This has the same effect as disabling it, except
++ *  that its appearance is unchanged.
++ *
++ *  @short Widget to enter a time of day.
++ *  @author David Jarvie <software@astrojar.org.uk>
++ */
+ class TimeEdit : public QHBox
+ {
+ 		Q_OBJECT
+ 	public:
++		/** Constructor.
++		 *  @param parent The parent object of this widget.
++		 *  @param name The name of this widget.
++		 */
+ 		explicit TimeEdit(QWidget* parent = 0, const char* name = 0);
++		/** Returns true if the widget is read only. */
+ 		bool          isReadOnly() const           { return mReadOnly; }
+-		void          setReadOnly(bool);
++		/** Sets whether the spin box is read-only for the user. If read-only,
++		 *  the time cannot be edited and the spin buttons and am/pm combo box
++		 *  are inactive.
++		 *  @param readOnly True to set the widget read-only, false to set it read-write.
++		 */
++		void          setReadOnly(bool readOnly);
++		/** Returns true if the spin box contains a valid value. */
+ 		bool          isValid() const;
+-		void          setValid(bool);
+-		int           value() const;               // time in minutes
++		/** Sets whether the edit value is valid.
++		 *  If newly invalid, the value is displayed as asterisks.
++		 *  If newly valid, the value is set to the minimum value.
++		 *  @param valid True to set the value valid, false to set it invalid.
++		 */
++		void          setValid(bool valid);
++		/** Returns the entered time as a value in minutes. */
++		int           value() const;
++		/** Returns the entered time as a QTime value. */
+ 		QTime         time() const                 { int m = value();  return QTime(m/60, m%60); }
++		/** Returns true if it is possible to step the value from the highest value to the lowest value and vice versa. */
+ 		bool          wrapping() const;
++		/** Sets whether it is possible to step the value from the highest value to the lowest value and vice versa.
++		 *  @param on True to enable wrapping, else false.
++		 */
+ 		void          setWrapping(bool on);
++		/** Returns the minimum value of the spin box in minutes. */
+ 		int           minValue() const;
++		/** Returns the maximum value of the spin box in minutes. */
+ 		int           maxValue() const;
++		/** Returns the maximum value of the spin box as a QTime value. */
+ 		QTime         maxTime() const              { int mv = maxValue();  return QTime(mv/60, mv%60); }
++		/** Sets the minimum value of the spin box. */
+ 		void          setMinValue(int minutes);
++		/** Sets the maximum value of the spin box. */
+ 		void          setMaxValue(int minutes);
+-		void          setMaxValue(const QTime& t)  { setMaxValue(t.hour()*60 + t.minute()); }
++		/** Sets the maximum value of the spin box. */
++		void          setMaxValue(const QTime& time)  { setMaxValue(time.hour()*60 + time.minute()); }
+ 	public slots:
++		/** Sets the value of the spin box. */
+ 		virtual void  setValue(int minutes);
++		/** Sets the value of the spin box. */
+ 		void          setValue(const QTime& t)     { setValue(t.hour()*60 + t.minute()); }
+ 	signals:
++		/** This signal is emitted every time the value of the spin box changes
++		 *  (for whatever reason).
++		 *  @param minutes The new value.
++		 */
+ 		void          valueChanged(int minutes);
+ 
+ 	private slots:
+Index: kmail/htmlstatusbar.cpp
+===================================================================
+RCS file: /home/kde/kdepim/kmail/htmlstatusbar.cpp,v
+retrieving revision 1.2
+retrieving revision 1.2.8.1
+diff -u -d -r1.2 -r1.2.8.1
+--- kmail/htmlstatusbar.cpp	11 Jan 2004 21:57:07 -0000	1.2
++++ kmail/htmlstatusbar.cpp	4 Mar 2005 21:49:33 -0000	1.2.8.1
+@@ -53,6 +53,8 @@
+     mMode( Normal )
+ {
+   setAlignment( AlignHCenter|AlignTop );
++  // Don't force a minimum height to the reader widget
++  setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored ) );
+   upd();
+ }
+ 
+Index: korganizer/kotodoview.cpp
+===================================================================
+RCS file: /home/kde/kdepim/korganizer/kotodoview.cpp,v
+retrieving revision 1.193
+retrieving revision 1.193.2.1
+diff -u -d -r1.193 -r1.193.2.1
+--- korganizer/kotodoview.cpp	7 Jan 2005 17:43:22 -0000	1.193
++++ korganizer/kotodoview.cpp	5 Mar 2005 19:41:29 -0000	1.193.2.1
+@@ -695,6 +695,7 @@
+             insertTodoItem( todo );
+           }
+         }
++        mTodoListView->sort();
+         break;
+       case KOGlobals::INCIDENCEDELETED:
+         if ( todoItem ) {
+Index: kresources/kolab/kabc/kolab.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/kolab/kabc/kolab.desktop,v
+retrieving revision 1.37
+retrieving revision 1.37.2.1
+diff -u -d -r1.37 -r1.37.2.1
+--- kresources/kolab/kabc/kolab.desktop	21 Feb 2005 18:18:48 -0000	1.37
++++ kresources/kolab/kabc/kolab.desktop	5 Mar 2005 16:54:57 -0000	1.37.2.1
+@@ -25,4 +25,4 @@
+ Type=Service
+ ServiceTypes=KResources/Plugin
+ X-KDE-ResourceFamily=contact
+-X-KDE-ResourceType=imap
++X-KDE-ResourceType=kolab
+Index: kresources/kolab/kcal/kolab.desktop
+===================================================================
+RCS file: /home/kde/kdepim/kresources/kolab/kcal/kolab.desktop,v
+retrieving revision 1.46
+retrieving revision 1.46.2.1
+diff -u -d -r1.46 -r1.46.2.1
+--- kresources/kolab/kcal/kolab.desktop	21 Feb 2005 18:18:48 -0000	1.46
++++ kresources/kolab/kcal/kolab.desktop	5 Mar 2005 16:54:57 -0000	1.46.2.1
+@@ -25,4 +25,4 @@
+ Type=Service
+ ServiceTypes=KResources/Plugin
+ X-KDE-ResourceFamily=calendar
+-X-KDE-ResourceType=imap
++X-KDE-ResourceType=kolab

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/02_disable_no_undefined.diff

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/03_automake1.8.diff

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/04_disable_static_la_final.diff

Copied: branches/kde-3.4.0/packages/kdepim/debian/patches/10_korganizer_makefile.diff (from rev 716, branches/kde-3.4.0/packages/kdepim/debian/patches/20_korganizer_makefile.diff)

Copied: branches/kde-3.4.0/packages/kdepim/debian/patches/11_lib_link.diff (from rev 716, branches/kde-3.4.0/packages/kdepim/debian/patches/21_lib_link.diff)
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/patches/21_lib_link.diff	2005-03-06 06:13:34 UTC (rev 716)
+++ branches/kde-3.4.0/packages/kdepim/debian/patches/11_lib_link.diff	2005-03-06 12:33:12 UTC (rev 719)
@@ -0,0 +1,16 @@
+Index: kalarm/kalarmd/Makefile.am
+===================================================================
+RCS file: /home/kde/kdepim/kalarm/kalarmd/Makefile.am,v
+retrieving revision 1.52
+diff -u -r1.52 Makefile.am
+--- kalarm/kalarmd/Makefile.am	20 Feb 2005 20:24:55 -0000	1.52
++++ kalarm/kalarmd/Makefile.am	6 Mar 2005 06:55:31 -0000
+@@ -3,7 +3,7 @@
+ noinst_LTLIBRARIES = libkalarmd.la
+ 
+ libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-libkalarmd_la_LIBADD  = $(LIB_KDECORE)
++libkalarmd_la_LIBADD  = $(LIB_KDECORE) $(top_builddir)/libkcal/libkcal.la
+ libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub
+ 
+ bin_PROGRAMS = kalarmd

Copied: branches/kde-3.4.0/packages/kdepim/debian/patches/12_kmail_nofinal.diff (from rev 716, branches/kde-3.4.0/packages/kdepim/debian/patches/22_kmail_nofinal.diff)

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/20_korganizer_makefile.diff

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/21_lib_link.diff

Deleted: branches/kde-3.4.0/packages/kdepim/debian/patches/22_kmail_nofinal.diff

Modified: branches/kde-3.4.0/packages/kdepim/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/rules	2005-03-06 12:29:46 UTC (rev 718)
+++ branches/kde-3.4.0/packages/kdepim/debian/rules	2005-03-06 12:33:12 UTC (rev 719)
@@ -1,7 +1,10 @@
 #! /usr/bin/make -f
 
+DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tar.bz2) .tar.bz2)
+
+include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/kde.mk
+include debian/cdbs/kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
@@ -9,13 +12,19 @@
 DEB_KDE_ENABLE_FINAL := yes
 DEB_KDE_APIDOX := yes
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --disable-static
+DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
 post-patches:: debian/stamp-libtool-update
 
 debian/stamp-libtool-update:
-	cp -f /usr/share/libtool/libtool.m4 admin/libtool.m4.in
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
+	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
+	cp -f /usr/share/libtool/ltmain.sh $(DEB_SRCDIR)/admin/ltmain.sh
+	for f in /usr/share/automake-1.9/*; do \
+		if test -f $$f && ! test -L $$f && \
+			test $(DEB_SRCDIR)/admin/`basename $$f`; then \
+			cp -f $$f $(DEB_SRCDIR)/admin/; \
+		fi; \
+	done
 	touch debian/stamp-libtool-update
 
 common-build-arch:: debian/stamp-man-pages
@@ -30,24 +39,23 @@
 clean::
 	rm -f debian/man/*.1
 	rm -f debian/stamp-libtool-update debian/stamp-man-pages
-	rm -f admin/libtool.m4.in admin/ltmain.sh
-	rm -f Makefile.cvs
-	rm -f debian/patches/04_korganizer_makefile.diff \
-		debian/patches/05_lib_link.diff
+	rm -f debian/patches/common/02_autotools_update.diff \
+		debian/patches/common/03_libtool_update.diff
 
 DEB_INSTALL_DOCS_ALL :=
 
-DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(cdbs_curpkg)/$$f; then echo $(cdbs_curpkg)/$$f; break; fi; done)
+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.3.1
-DEB_DH_MAKESHLIBS_ARGS_libkcal2a := -V'libkcal2a (>= 4:3.3.2)'
+shlibs_ver=4:3.4.0
+DEB_DH_MAKESHLIBS_ARGS_libkcal2a := -V'libkcal2a (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkdepim1 := -V'libkdepim1 (>= 4:3.3.2)'
+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_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_kaddressbook := -V
 DEB_DH_MAKESHLIBS_ARGS_kalarm := -V
@@ -57,35 +65,19 @@
 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
 
-DEB_SHLIBDEPS_INCLUDE := \
-	debian/kaddressbook/usr/lib \
-	debian/kalarm/usr/lib \
-	debian/kdepim-wizards/usr/lib \
-	debian/kitchensync/usr/lib \
-	debian/kleopatra/usr/lib \
-	debian/kmail/usr/lib \
-	debian/knode/usr/lib \
-	debian/knotes/usr/lib \
-	debian/kontact/usr/lib \
-	debian/korganizer/usr/lib \
-	debian/kpilot/usr/lib \
-	debian/ksync/usr/lib \
-	debian/ktnef/usr/lib \
-	debian/libkcal2a/usr/lib \
-	debian/libkdenetwork2/usr/lib \
-	debian/libkdepim1/usr/lib \
-	debian/libkgantt0/usr/lib \
-	debian/libkleopatra0/usr/lib \
-	debian/libkpimexchange1/usr/lib \
-	debian/libkpimidentities1/usr/lib \
-	debian/libksieve0/usr/lib \
-	debian/libmimelib1/usr/lib
+PKGS_WITH_LIBS := 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)
 
 # kontact starts fine without korganizer or kpilot dependencies
 DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))