[pkg-kde-commits] rev 2554 - in trunk/packages/kdepim/debian: . patches

Daniel Schepler schepler at costa.debian.org
Tue Dec 6 13:08:11 UTC 2005


Author: schepler
Date: 2005-12-06 13:08:08 +0000 (Tue, 06 Dec 2005)
New Revision: 2554

Added:
   trunk/packages/kdepim/debian/libindex0-dev.docs
   trunk/packages/kdepim/debian/libindex0-dev.install
   trunk/packages/kdepim/debian/libindex0.install
   trunk/packages/kdepim/debian/libkleopatra1-dev.install
   trunk/packages/kdepim/debian/libkleopatra1.install
Removed:
   trunk/packages/kdepim/debian/libkleopatra0-dev.install
   trunk/packages/kdepim/debian/libkleopatra0a.install
   trunk/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff
Modified:
   trunk/packages/kdepim/debian/
   trunk/packages/kdepim/debian/akregator.install
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/compat
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/copyright
   trunk/packages/kdepim/debian/kaddressbook.install
   trunk/packages/kdepim/debian/kalarm.install
   trunk/packages/kdepim/debian/karm.install
   trunk/packages/kdepim/debian/kdepim-dev.install
   trunk/packages/kdepim/debian/kdepim-kresources.install
   trunk/packages/kdepim/debian/kdepim-wizards.install
   trunk/packages/kdepim/debian/kitchensync.install
   trunk/packages/kdepim/debian/kmail.install
   trunk/packages/kdepim/debian/knode.install
   trunk/packages/kdepim/debian/knotes.install
   trunk/packages/kdepim/debian/kontact.install
   trunk/packages/kdepim/debian/korganizer.install
   trunk/packages/kdepim/debian/korn.install
   trunk/packages/kdepim/debian/kpilot.install
   trunk/packages/kdepim/debian/libkcal2b.install
   trunk/packages/kdepim/debian/libkdepim1a.install
   trunk/packages/kdepim/debian/rules
Log:
Commit kdepim-3.5.0-1 packaging changes.



Property changes on: trunk/packages/kdepim/debian
___________________________________________________________________
Name: svn:ignore
   - *.debhelper
*.substvars
stamp-*
files
akregator
kaddressbook
kalarm
kandy
karm
kdepim
kdepim-dev
kdepim-doc
kdepim-doc-html
kdepim-kfile-plugins
kdepim-kio-plugins
kdepim-kresources
kdepim-wizards
kitchensync
kleopatra
kmail
kmailcvt
knode
knotes
kode
konsolekalendar
kontact
korganizer
korn
kpilot
ksync
ktnef
libkcal2b
libkcal2-dev
libkdepim1a
libkdepim1-dev
libkgantt0
libkgantt0-dev
libkleopatra0a
libkleopatra0-dev
libkmime2
libkpimexchange1
libkpimexchange1-dev
libkpimidentities1
libksieve0
libksieve0-dev
libktnef1
libktnef1-dev
libmimelib1c2a
libmimelib1-dev
networkstatus
tmp

   + *.debhelper
*.substvars
stamp-*
cdbs-install-list
cdbs-package-list
files
akregator
kaddressbook
kalarm
kandy
karm
kdepim
kdepim-dev
kdepim-doc
kdepim-doc-html
kdepim-kfile-plugins
kdepim-kio-plugins
kdepim-kresources
kdepim-wizards
kitchensync
kleopatra
kmail
kmailcvt
knode
knotes
kode
konsolekalendar
kontact
korganizer
korn
kpilot
ksync
ktnef
libindex0
libindex0-dev
libkcal2b
libkcal2-dev
libkdepim1a
libkdepim1-dev
libkgantt0
libkgantt0-dev
libkleopatra1
libkleopatra1-dev
libkmime2
libkpimexchange1
libkpimexchange1-dev
libkpimidentities1
libksieve0
libksieve0-dev
libktnef1
libktnef1-dev
libmimelib1c2a
libmimelib1-dev
networkstatus
tmp


Modified: trunk/packages/kdepim/debian/akregator.install
===================================================================
--- trunk/packages/kdepim/debian/akregator.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/akregator.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -1,22 +1,32 @@
 /usr/bin/akregator
 /usr/lib/kde3/libakregatorpart.la
 /usr/lib/kde3/libakregatorpart.so
+/usr/lib/kde3/libakregator_mk4storage_plugin.la
+/usr/lib/kde3/libakregator_mk4storage_plugin.so
 /usr/lib/libakregatorprivate.la
 /usr/lib/libakregatorprivate.so
-/usr/share/applnk/Internet/akregator.desktop
+/usr/share/applications/kde/akregator.desktop
 /usr/share/apps/akregator
 /usr/share/config.kcfg/akregator.kcfg
+/usr/share/config.kcfg/mk4config.kcfg
 /usr/share/doc/kde/HTML/en/akregator
-/usr/share/icons/crystalsvg/128x128/apps/akregator.png
+/usr/share/icons/hicolor/128x128/apps/akregator.png
+/usr/share/icons/crystalsvg/16x16/actions/rss_tag.png
+/usr/share/icons/crystalsvg/22x22/actions/rss_tag.png
+/usr/share/icons/crystalsvg/32x32/actions/rss_tag.png
+/usr/share/icons/crystalsvg/48x48/actions/rss_tag.png
+/usr/share/icons/crystalsvg/64x64/actions/rss_tag.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/icons/hicolor/16x16/apps/akregator.png
+/usr/share/icons/hicolor/22x22/apps/akregator.png
+/usr/share/icons/hicolor/32x32/apps/akregator.png
+/usr/share/icons/hicolor/48x48/apps/akregator.png
+/usr/share/icons/hicolor/64x64/apps/akregator.png
+/usr/share/icons/hicolor/scalable/apps/akregator.svgz
+/usr/share/services/akregator_mk4storage_plugin.desktop
 /usr/share/services/akregator_part.desktop
 /usr/share/services/feed.protocol
+/usr/share/servicetypes/akregator_plugin.desktop
 ../icons/akregator.xpm /usr/share/pixmaps
 ../icons/akregator-16.xpm /usr/share/pixmaps
 

Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/changelog	2005-12-06 13:08:08 UTC (rev 2554)
@@ -1,3 +1,12 @@
+kdepim (4:3.5.0-1) alioth; urgency=low
+
+  * New upstream release.
+  * Bump debian/compat to 5.  No changes necessary.
+  * Rename libkleopatra0a to libkleopatra1 due to SONAME change.
+  * New packages: libindex0 and libindex0-dev.
+
+ -- Daniel Schepler <schepler at debian.org>  Tue,  6 Dec 2005 11:18:32 +0100
+
 kdepim (4:3.4.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdepim/debian/compat
===================================================================
--- trunk/packages/kdepim/debian/compat	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/compat	2005-12-06 13:08:08 UTC (rev 2554)
@@ -1 +1 @@
-4
+5

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/control	2005-12-06 13:08:08 UTC (rev 2554)
@@ -3,14 +3,15 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>
-Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 4.2.21), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.4.3-2), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
-Build-Depends-Indep: doxygen, qt3-doc, kdelibs4-doc
+Build-Depends: g++-3.4 [arm m68k hppa], autoconf, automake1.9, bison, byacc, bzip2, cdbs (>= 0.4.27), debhelper (>= 5), flex, gawk, gettext, groff-base, kdelibs4-dev (>= 4:3.5.0), libbluetooth1-dev, libgnokii2-dev (>= 0.6.5), libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, qt3-doc, kdelibs4-doc
+Build-Conflicts: libkleopatra0-dev
 Standards-Version: 3.6.2
 
 Package: kdepim
 Section: kde
 Architecture: all
-Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra0a (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
+Depends: akregator (>= ${Source-Version}), kaddressbook (>= ${Source-Version}), kalarm (>= ${Source-Version}), kandy (>= ${Source-Version}), karm (>= ${Source-Version}), kdepim-kfile-plugins (>= ${Source-Version}), kdepim-kio-plugins (>= ${Source-Version}), kdepim-kresources (>= ${Source-Version}), kdepim-wizards (>= ${Source-Version}), kitchensync (>= ${Source-Version}), kleopatra (>= ${Source-Version}), kmail (>= ${Source-Version}), kmailcvt (>= ${Source-Version}), knode (>= ${Source-Version}), knotes (>= ${Source-Version}), konsolekalendar (>= ${Source-Version}), kontact (>= ${Source-Version}), korganizer (>= ${Source-Version}), korn (>= ${Source-Version}), kpilot (>= ${Source-Version}), ksync (>= ${Source-Version}), ktnef (>= ${Source-Version}), networkstatus (>= ${Source-Version}), libindex0 (>= ${Source-Version}), libkcal2b (>= ${Source-Version}), libkdepim1a (>= ${Source-Version}), libkgantt0 (>= ${Source-Version}), libkleopatra1 (>= ${Source-Version}), libkpimexchange1 (>= ${Source-Version}), libkpimidentities1 (>= ${Source-Version}), libksieve0 (>= ${Source-Version}), libktnef1 (>= ${Source-Version}), libmimelib1c2a (>= ${Source-Version})
 Suggests: kdepim-doc-html
 Description: KDE Personal Information Management metapackage
  kdepim is a collection of Personal Information Management (PIM) tools for the
@@ -22,7 +23,7 @@
 Package: kdepim-dev
 Section: devel
 Architecture: any
-Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra0-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-kresources (= ${Source-Version}), kitchensync (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkpimidentities1 (= ${Source-Version}), libkcal2-dev (= ${Source-Version}), libkdepim1-dev (= ${Source-Version}), libkgantt0-dev (= ${Source-Version}), libkleopatra1-dev (= ${Source-Version}), libkpimexchange1-dev (= ${Source-Version}), libksieve0-dev (= ${Source-Version}), libktnef1-dev (= ${Source-Version}), libmimelib1-dev (= ${Source-Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.
@@ -363,10 +364,36 @@
  .
  This package is part of the official KDE pim module.
 
+Package: libindex0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: KDE indexing library
+ This library provides text indexing and is currently used by KMail
+ to implement fast searches in mail bodies.
+ .
+ This is the runtime package for programs that use the libindex library.
+ .
+ This package is part of the official KDE pim module.
+
+Package: libindex0-dev
+Section: libdevel
+Architecture: any
+Depends: libindex0 (= ${Source-Version})
+Description: KDE indexing library [development]
+ This library provides text indexing and is currently used by KMail
+ to implement searching through mail text.
+ .
+ This is the development package which contains the headers for the libindex
+ library.
+ .
+ This package is part of the official KDE pim module.
+
 Package: libkcal2b
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}
 Conflicts: libkcal2, libkcal2a
 Replaces: libkcal2a
 Suggests: kdepim-kresources
@@ -432,12 +459,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libkleopatra0a
+Package: libkleopatra1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
-Conflicts: libkleopatra0
-Replaces: libkdenetwork2
+Conflicts: libkleopatra0, libkleopatra0a
+Replaces: libkdenetwork2, libkleopatra0a
 Description: KDE GnuPG interface libraries
  This library is used by several KDE applications to interface to the
  GnuPG program.
@@ -446,10 +473,12 @@
  .
  This package is part of the official KDE pim module.
 
-Package: libkleopatra0-dev
+Package: libkleopatra1-dev
 Section: libdevel
 Architecture: any
-Depends: libkleopatra0a (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Depends: libkleopatra1 (= ${Source-Version}), libkdepim1-dev (= ${Source-Version})
+Conflicts: libkleopatra0-dev
+Replaces: libkleopatra0-dev
 Description: KDE GnuPG interface libraries [development]
  This library is used by several KDE applications to interface to the
  GnuPG program.

Modified: trunk/packages/kdepim/debian/copyright
===================================================================
--- trunk/packages/kdepim/debian/copyright	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/copyright	2005-12-06 13:08:08 UTC (rev 2554)
@@ -27,7 +27,7 @@
 akregator, kaddressbook, kalarm, kalarmd, kandy, karm, kdgantt,
 kfile-plugins, kgantt, kioslaves, kitchensync, kleopatra, kmail,
 kmailcvt, knode, knotes, konsolekalendar, kontact, korganizer, kpilot,
-ksync, ktnef, libkdenetwork, libkdepim, libkleopatra,
+ksync, ktnef, libindex, libkdenetwork, libkdepim, libkleopatra,
 libkpimidentities, libksieve, mimelib, wizards
 ----------------------------------------------------------------------------
 GPL

Modified: trunk/packages/kdepim/debian/kaddressbook.install
===================================================================
--- trunk/packages/kdepim/debian/kaddressbook.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kaddressbook.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -19,11 +19,11 @@
 /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/icons/hicolor/128x128/apps/kaddressbook.png
+/usr/share/icons/hicolor/16x16/apps/kaddressbook.png
+/usr/share/icons/hicolor/32x32/apps/kaddressbook.png
+/usr/share/icons/hicolor/48x48/apps/kaddressbook.png
+/usr/share/icons/hicolor/64x64/apps/kaddressbook.png
 /usr/share/services/kabconfig.desktop
 /usr/share/services/kabcustomfields.desktop
 /usr/share/services/kabldapconfig.desktop

Modified: trunk/packages/kdepim/debian/kalarm.install
===================================================================
--- trunk/packages/kdepim/debian/kalarm.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kalarm.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -8,9 +8,9 @@
 /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/hicolor/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
+/usr/share/icons/hicolor/32x32/apps/kalarm.png
+/usr/share/icons/hicolor/48x48/apps/kalarm.png
 ../icons/kalarm.xpm /usr/share/pixmaps
 ../icons/kalarm-16.xpm /usr/share/pixmaps

Modified: trunk/packages/kdepim/debian/karm.install
===================================================================
--- trunk/packages/kdepim/debian/karm.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/karm.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -1,12 +1,17 @@
 /usr/bin/karm
+/usr/lib/kde3/libkarmpart.la
+/usr/lib/kde3/libkarmpart.so
 /usr/share/applications/kde/karm.desktop
 /usr/share/applnk/Utilities/karm.desktop
 /usr/share/apps/karm
+/usr/share/apps/karmpart
 /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
+/usr/share/icons/hicolor/128x128/apps/karm.png
+/usr/share/icons/hicolor/16x16/apps/karm.png
+/usr/share/icons/hicolor/22x22/apps/karm.png
+/usr/share/icons/hicolor/32x32/apps/karm.png
+/usr/share/icons/hicolor/48x48/apps/karm.png
+/usr/share/icons/hicolor/64x64/apps/karm.png
+/usr/share/services/karm_part.desktop
 ../icons/karm.xpm /usr/share/pixmaps
 ../icons/karm-16.xpm /usr/share/pixmaps

Modified: trunk/packages/kdepim/debian/kdepim-dev.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-dev.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kdepim-dev.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -1,7 +1,8 @@
 /usr/include/kde/KNotesAppIface.h
 /usr/include/kde/KNotesIface.h
+/usr/include/kde/akregator
+/usr/include/kde/calendar
 /usr/include/kde/kabc
-/usr/include/kde/calendar
 /usr/include/kde/kaddressbook
 /usr/include/kde/kitchensync
 /usr/include/kde/kmail

Modified: trunk/packages/kdepim/debian/kdepim-kresources.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-kresources.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kdepim-kresources.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -62,6 +62,7 @@
 /usr/share/services/kresources/kabc/kabc_groupwise.desktop
 /usr/share/services/kresources/kabc/kabc_newexchange.desktop
 /usr/share/services/kresources/kabc/kabc_opengroupware.desktop
+/usr/share/services/kresources/kabc/kabc_ox.desktop
 /usr/share/services/kresources/kabc/kabc_slox.desktop
 /usr/share/services/kresources/kabc/kabc_xmlrpc.desktop
 /usr/share/services/kresources/kabc/kolab.desktop
@@ -71,6 +72,7 @@
 /usr/share/services/kresources/kcal/kcal_groupwise.desktop
 /usr/share/services/kresources/kcal/kcal_newexchange.desktop
 /usr/share/services/kresources/kcal/kcal_opengroupware.desktop
+/usr/share/services/kresources/kcal/kcal_ox.desktop
 /usr/share/services/kresources/kcal/kcal_resourcefeatureplan.desktop
 /usr/share/services/kresources/kcal/kcal_slox.desktop
 /usr/share/services/kresources/kcal/kcal_xmlrpc.desktop

Modified: trunk/packages/kdepim/debian/kdepim-wizards.install
===================================================================
--- trunk/packages/kdepim/debian/kdepim-wizards.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kdepim-wizards.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -14,6 +14,7 @@
 /usr/lib/kde3/libkolabwizard.so
 /usr/lib/kde3/libsloxwizard.la
 /usr/lib/kde3/libsloxwizard.so
+/usr/share/applications/kde/groupwarewizard.desktop
 /usr/share/config.kcfg/egroupware.kcfg
 /usr/share/config.kcfg/groupwise.kcfg
 /usr/share/config.kcfg/kolab.kcfg

Modified: trunk/packages/kdepim/debian/kitchensync.install
===================================================================
--- trunk/packages/kdepim/debian/kitchensync.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kitchensync.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -2,6 +2,10 @@
 /usr/bin/multisynk
 /usr/lib/kde3/libkitchensyncpart.la
 /usr/lib/kde3/libkitchensyncpart.so
+/usr/lib/kde3/libksfilter_addressbook.la
+/usr/lib/kde3/libksfilter_addressbook.so
+/usr/lib/kde3/libksfilter_calendar.la
+/usr/lib/kde3/libksfilter_calendar.so
 /usr/lib/kde3/libksync_backup.la
 /usr/lib/kde3/libksync_backup.so
 /usr/lib/kde3/libksync_debugger.la
@@ -42,10 +46,10 @@
 /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/icons/hicolor/16x16/apps/multisynk.png
+/usr/share/icons/hicolor/22x22/apps/multisynk.png
+/usr/share/icons/hicolor/32x32/apps/multisynk.png
+/usr/share/icons/hicolor/48x48/apps/multisynk.png
 /usr/share/services/kitchensync
 /usr/share/services/kresources/konnector
 /usr/share/services/kresources/konnector_manager.desktop

Modified: trunk/packages/kdepim/debian/kmail.install
===================================================================
--- trunk/packages/kdepim/debian/kmail.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kmail.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -41,15 +41,15 @@
 /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/hicolor/128x128/apps/kmail.png
+/usr/share/icons/hicolor/16x16/apps/kmail.png
+/usr/share/icons/hicolor/22x22/apps/kmail.png
 /usr/share/icons/crystalsvg/22x22/apps/kmaillight.png
-/usr/share/icons/crystalsvg/32x32/apps/kmail.png
+/usr/share/icons/hicolor/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/icons/hicolor/48x48/apps/kmail.png
+/usr/share/icons/hicolor/64x64/apps/kmail.png
+/usr/share/icons/hicolor/scalable/apps/kmail.svgz
 /usr/share/services/kmail_config_*.desktop
 /usr/share/servicetypes/dcopimap.desktop
 /usr/share/servicetypes/dcopmail.desktop

Modified: trunk/packages/kdepim/debian/knode.install
===================================================================
--- trunk/packages/kdepim/debian/knode.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/knode.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -8,16 +8,16 @@
 /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/icons/hicolor/128x128/apps/knode.png
+/usr/share/icons/hicolor/128x128/apps/knode2.png
+/usr/share/icons/hicolor/16x16/apps/knode.png
+/usr/share/icons/hicolor/16x16/apps/knode2.png
+/usr/share/icons/hicolor/32x32/apps/knode.png
+/usr/share/icons/hicolor/32x32/apps/knode2.png
+/usr/share/icons/hicolor/48x48/apps/knode.png
+/usr/share/icons/hicolor/48x48/apps/knode2.png
+/usr/share/icons/hicolor/64x64/apps/knode.png
+/usr/share/icons/hicolor/64x64/apps/knode2.png
 /usr/share/services/knewsservice.protocol
 /usr/share/services/knode_config_*.desktop
 ../icons/knode.xpm /usr/share/pixmaps

Modified: trunk/packages/kdepim/debian/knotes.install
===================================================================
--- trunk/packages/kdepim/debian/knotes.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/knotes.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -6,12 +6,12 @@
 /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/icons/hicolor/128x128/apps/knotes.png
+/usr/share/icons/hicolor/16x16/apps/knotes.png
+/usr/share/icons/hicolor/22x22/apps/knotes.png
+/usr/share/icons/hicolor/32x32/apps/knotes.png
+/usr/share/icons/hicolor/48x48/apps/knotes.png
+/usr/share/icons/hicolor/64x64/apps/knotes.png
 /usr/share/services/kresources/knotes/imap.desktop
 /usr/share/services/kresources/knotes/local.desktop
 /usr/share/services/kresources/knotes_manager.desktop

Modified: trunk/packages/kdepim/debian/kontact.install
===================================================================
--- trunk/packages/kdepim/debian/kontact.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kontact.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -1,6 +1,4 @@
 /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
@@ -24,19 +22,17 @@
 /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/hicolor/128x128/apps/kontact.png
 /usr/share/icons/crystalsvg/16x16/actions/kontact_*.png
-/usr/share/icons/crystalsvg/16x16/apps/kontact.png
+/usr/share/icons/hicolor/16x16/apps/kontact.png
 /usr/share/icons/crystalsvg/22x22/actions/kontact_*.png
-/usr/share/icons/crystalsvg/22x22/apps/kontact.png
+/usr/share/icons/hicolor/22x22/apps/kontact.png
 /usr/share/icons/crystalsvg/32x32/actions/kontact_*.png
-/usr/share/icons/crystalsvg/32x32/apps/kontact.png
+/usr/share/icons/hicolor/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/hicolor/48x48/apps/kontact.png
 /usr/share/icons/crystalsvg/64x64/actions/kontact_*.png
-/usr/share/icons/crystalsvg/64x64/apps/kontact.png
-/usr/share/services/kcmkabsummary.desktop
+/usr/share/icons/hicolor/64x64/apps/kontact.png
 /usr/share/services/kcmkmailsummary.desktop
 /usr/share/services/kcmkontactknt.desktop
 /usr/share/services/kcmkontactsummary.desktop

Modified: trunk/packages/kdepim/debian/korganizer.install
===================================================================
--- trunk/packages/kdepim/debian/korganizer.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/korganizer.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -24,11 +24,11 @@
 /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/icons/hicolor/128x128/apps/korganizer.png
+/usr/share/icons/hicolor/16x16/apps/korganizer.png
+/usr/share/icons/hicolor/32x32/apps/korganizer.png
+/usr/share/icons/hicolor/48x48/apps/korganizer.png
+/usr/share/icons/hicolor/64x64/apps/korganizer.png
 /usr/share/services/korganizer_*.desktop
 /usr/share/services/korganizer
 /usr/share/services/webcal.protocol

Modified: trunk/packages/kdepim/debian/korn.install
===================================================================
--- trunk/packages/kdepim/debian/korn.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/korn.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -2,9 +2,12 @@
 /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/apps/kconf_update/korn-3-5-metadata-update.pl
+/usr/share/apps/kconf_update/korn-3-5-ssl-update.pl
+/usr/share/apps/kconf_update/korn-3-5-update.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
+/usr/share/icons/hicolor/16x16/apps/korn.png
+/usr/share/icons/hicolor/32x32/apps/korn.png
+/usr/share/icons/hicolor/48x48/apps/korn.png
 ../icons/korn.xpm /usr/share/pixmaps
 ../icons/korn-16.xpm /usr/share/pixmaps

Modified: trunk/packages/kdepim/debian/kpilot.install
===================================================================
--- trunk/packages/kdepim/debian/kpilot.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/kpilot.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -27,16 +27,16 @@
 /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/hicolor/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/hicolor/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/hicolor/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/hicolor/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

Added: trunk/packages/kdepim/debian/libindex0-dev.docs
===================================================================
--- trunk/packages/kdepim/debian/libindex0-dev.docs	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/libindex0-dev.docs	2005-12-06 13:08:08 UTC (rev 2554)
@@ -0,0 +1,2 @@
+build-tree/kdepim-*/indexlib/README
+build-tree/kdepim-*/indexlib/docs/report.pdf

Added: trunk/packages/kdepim/debian/libindex0-dev.install
===================================================================
--- trunk/packages/kdepim/debian/libindex0-dev.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/libindex0-dev.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -0,0 +1,4 @@
+/usr/bin/indexlib-config
+/usr/include/kde/index
+/usr/lib/libindex.la
+/usr/lib/libindex.so

Added: trunk/packages/kdepim/debian/libindex0.install
===================================================================
--- trunk/packages/kdepim/debian/libindex0.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/libindex0.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -0,0 +1,2 @@
+/usr/lib/libindex.so.0
+/usr/lib/libindex.so.0.0.0

Modified: trunk/packages/kdepim/debian/libkcal2b.install
===================================================================
--- trunk/packages/kdepim/debian/libkcal2b.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/libkcal2b.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -12,6 +12,7 @@
 /usr/lib/libkcal_resourceremote.so.1.0.0
 /usr/lib/libkholidays.so.1
 /usr/lib/libkholidays.so.1.0.0
+/usr/share/apps/libical
 /usr/share/apps/libkholidays
 /usr/share/services/kresources/kcal/imap.desktop
 /usr/share/services/kresources/kcal/kabc.desktop

Modified: trunk/packages/kdepim/debian/libkdepim1a.install
===================================================================
--- trunk/packages/kdepim/debian/libkdepim1a.install	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/libkdepim1a.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -7,3 +7,5 @@
 /usr/share/apps/kdepimwidgets
 /usr/share/apps/libkdepim
 /usr/share/config.kcfg/pimemoticons.kcfg
+/usr/share/icons/crystalsvg/22x22/actions/button_fewer.png
+/usr/share/icons/crystalsvg/22x22/actions/button_more.png
\ No newline at end of file

Deleted: trunk/packages/kdepim/debian/libkleopatra0-dev.install

Deleted: trunk/packages/kdepim/debian/libkleopatra0a.install

Copied: trunk/packages/kdepim/debian/libkleopatra1-dev.install (from rev 2542, trunk/packages/kdepim/debian/libkleopatra0-dev.install)

Copied: trunk/packages/kdepim/debian/libkleopatra1.install (from rev 2542, trunk/packages/kdepim/debian/libkleopatra0a.install)
===================================================================
--- trunk/packages/kdepim/debian/libkleopatra0a.install	2005-12-05 13:15:17 UTC (rev 2542)
+++ trunk/packages/kdepim/debian/libkleopatra1.install	2005-12-06 13:08:08 UTC (rev 2554)
@@ -0,0 +1,18 @@
+/etc/kde3/libkleopatrarc
+/usr/lib/libgpgme++.so.0
+/usr/lib/libgpgme++.so.0.2.0
+/usr/lib/libkleopatra.so.1
+/usr/lib/libkleopatra.so.1.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

Deleted: trunk/packages/kdepim/debian/patches/01_kdepim_branch_20051201.diff

Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules	2005-12-06 01:27:34 UTC (rev 2553)
+++ trunk/packages/kdepim/debian/rules	2005-12-06 13:08:08 UTC (rev 2554)
@@ -12,7 +12,7 @@
 DEB_KDE_ENABLE_FINAL := yes
 DEB_KDE_APIDOX := yes
 
-DEB_CONFIGURE_SCRIPT_ENV += KMIX=/usr/bin/kmix
+DEB_CONFIGURE_SCRIPT_ENV += KMIX=/usr/bin/kmix KTTSD=/usr/bin/kttsd
 
 DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR)
 
@@ -38,12 +38,13 @@
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-shlibs_ver=4:3.4.3
+shlibs_ver=4:3.5.0
+DEB_DH_MAKESHLIBS_ARGS_libindex0 := -V'libindex0 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdepim1a := -V'libkdepim1a (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkgantt0 := -V'libkgantt0 (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkleopatra0 := -V'libkleopatra0 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_libkleopatra1 := -V'libkleopatra1 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkmime2 := -V'libkmime2 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkpimexchange1 := -V'libkpimexchange1 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkpimidentities1 := -V'libkpimidentities1 (>= $(shlibs_ver))'
@@ -53,8 +54,8 @@
 
 PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
 	kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
-	korganizer kpilot ksync ktnef libkcal2b libkdenetwork2 libkdepim1a \
-	libkgantt0 libkleopatra0a libkmime2 libkpimexchange1 \
+	korganizer kpilot ksync ktnef libindex0 libkcal2b libkdenetwork2 \
+	libkdepim1a libkgantt0 libkleopatra1 libkmime2 libkpimexchange1 \
 	libkpimidentities1 libksieve0 libktnef1 libmimelib1c2a
 
 # kontact starts fine without korganizer or kpilot dependencies
@@ -78,6 +79,13 @@
 	debian/kdepim-kresources/usr/lib/libkabc_xmlrpc.so.1.* \
 	-dDepends
 
+# Move kaddressbook dependency of libkcal2b to Recommends
+DEB_DH_SHLIBDEPS_ARGS_libkcal2b := \
+	-Xusr/lib/kde3/kcal_kabc.so \
+	-- -dRecommends \
+	debian/libkcal2b/usr/lib/kde3/kcal_kabc.so \
+	-dDepends
+
 ###
 
 GCC4_ICES_HERE := arm m68k hppa




More information about the pkg-kde-commits mailing list