[Pkg-kde-commits] rev 771 - branches/kde-3.4.0/packages/kdepim/debian

Daniel Schepler schepler@costa.debian.org
Fri, 11 Mar 2005 09:30:56 +0100 

Author: schepler
Date: 2005-03-11 09:30:55 +0100 (Fri, 11 Mar 2005)
New Revision: 771

Added:
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc-html.doc-base.multisynk
   branches/kde-3.4.0/packages/kdepim/debian/shlibs.local
Modified:
   branches/kde-3.4.0/packages/kdepim/debian/changelog
   branches/kde-3.4.0/packages/kdepim/debian/control
   branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install
   branches/kde-3.4.0/packages/kdepim/debian/kitchensync.menu
   branches/kde-3.4.0/packages/kdepim/debian/kmail.install
   branches/kde-3.4.0/packages/kdepim/debian/kmail.manpages
   branches/kde-3.4.0/packages/kdepim/debian/knode.install
   branches/kde-3.4.0/packages/kdepim/debian/rules
Log:
More work on kdepim.


Modified: branches/kde-3.4.0/packages/kdepim/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/changelog	2005-03-11 08:30:55 UTC (rev 771)
@@ -11,8 +11,10 @@
   * Split off libktnef1 from the ktnef package since libkcal now depends
     on it.
     + Also split libktnef1-dev from kdepim-dev.
+  * Keep kmail's *.sh manpages from being installed in
+    /usr/share/man/sh/man1.
 
- -- Daniel Schepler <schepler@debian.org>  Sun,  6 Mar 2005 02:56:54 -0800
+ -- Daniel Schepler <schepler@debian.org>  Fri, 11 Mar 2005 00:20:53 -0800
 
 kdepim (4:3.3.2-2) unstable; urgency=low
 

Modified: branches/kde-3.4.0/packages/kdepim/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/control	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/control	2005-03-11 08:30:55 UTC (rev 771)
@@ -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}), libkdepim1 (= ${Source-Version}), libkpimidentities1 (= ${Source-Version})
+Depends: kaddressbook (= ${Source-Version}), kalarm (= ${Source-Version}), kdepim-wizards (= ${Source-Version}), kmail (= ${Source-Version}), knotes (= ${Source-Version}), kontact (= ${Source-Version}), korganizer (= ${Source-Version}), kpilot (= ${Source-Version}), ksync (= ${Source-Version}), libkdepim1 (= ${Source-Version}), libkpimidentities1 (= ${Source-Version})
 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]
@@ -126,7 +126,8 @@
 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.
+ This package includes the pim kioslaves. This includes imap4, sieve,
+ and mbox.
  .
  This package is part of the official KDE pim module.
 
@@ -148,7 +149,7 @@
 Suggests: konqueror
 Description: Synchronization framework
  This package contains a synchronization framework, still under heavy
- development.
+ development.  It also contains the multisynk GUI frontend.
  .
  This package is part of the official KDE pim module.
 
@@ -175,7 +176,7 @@
 Architecture: any
 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)
+Replaces: libkdenetwork2 (<< 4:3.2.92), kdepim-dev (<< 4:3.4.0)
 Provides: imap-client, mail-reader
 Description: KDE Email client
  KMail is a fully-featured email client that fits nicely into the KDE
@@ -202,7 +203,7 @@
 Section: news
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libkdenetwork2 (<< 4:3.2.92)
+Replaces: libkdenetwork2 (<< 4:3.2.92), kdepim-dev (<< 4:3.4.0)
 Provides: news-reader
 Description: KDE news reader
  KNode is an easy-to-use, convenient newsreader. It is intended to be usable
@@ -249,10 +250,10 @@
 Section: kde
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: ${shlibs:Recommends}, kaddressbook, kitchensync, kmail, knode, knotes
-Suggests: ${shlibs:Suggests}, knewsticker, kweather
-Replaces: kontact-plugins (<< 4:3.2.92), akregator (<< 4:3.4.0)
-Conflicts: kontact-plugins (<< 4:3.2.92)
+Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
+Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather
+Replaces: kontact-plugins (<< 4:3.2.92), akregator (<< 4:3.4.0), akregator-kontact-plugin
+Conflicts: kontact-plugins (<< 4:3.2.92), akregator-kontact-plugin
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and
@@ -415,8 +416,9 @@
 Package: libkleopatra0a
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, gnupg
+Depends: ${shlibs:Depends}, ${perl:Depends}, gnupg
 Conflicts: libkleopatra0
+Replaces: libkdenetwork2
 Description: KDE GnuPG interface libraries
  This library is used by several KDE applications to interface to the
  GnuPG program.
@@ -511,7 +513,7 @@
 Package: libktnef1-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: libktnef1 (= ${Source-Version})
 Replaces: kdepim-dev (<< 4:3.4.0)
 Description: KTNEF handler library [development]
  This library handles mail attachments using the TNEF format. These

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-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-dev.install	2005-03-11 08:30:55 UTC (rev 771)
@@ -39,10 +39,6 @@
 /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

Added: branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc-html.doc-base.multisynk
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc-html.doc-base.multisynk	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/kdepim-doc-html.doc-base.multisynk	2005-03-11 08:30:55 UTC (rev 771)
@@ -0,0 +1,9 @@
+Document: kdepim-doc-html-multisynk
+Title: The MultiSynk Handbook
+Author: Tobias Koenig
+Abstract: KDE synchronization application.
+Section: Apps/Tools
+
+Format: HTML
+Index: /usr/share/doc/kde/HTML/en/multisynk/index.html
+Files: /usr/share/doc/kde/HTML/en/multisynk/*.html

Modified: branches/kde-3.4.0/packages/kdepim/debian/kitchensync.menu
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kitchensync.menu	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/kitchensync.menu	2005-03-11 08:30:55 UTC (rev 771)
@@ -4,3 +4,10 @@
 	hints="KDE"\
 	title="KitchenSync"\
 	command="/usr/bin/kitchensync"
+
+?package(kitchensync):\
+	needs="X11"\
+	section="Apps/Tools"\
+	hints="KDE"\
+	title="MultiSynk"\
+	command="/usr/bin/multisynk"

Modified: branches/kde-3.4.0/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kmail.install	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/kmail.install	2005-03-11 08:30:55 UTC (rev 771)
@@ -14,6 +14,8 @@
 /usr/lib/kde3/libkmail_bodypartformatter_text_xdiff.so
 /usr/lib/kde3/libkmailpart.la
 /usr/lib/kde3/libkmailpart.so
+/usr/lib/libkmailprivate.la
+/usr/lib/libkmailprivate.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
@@ -52,3 +54,7 @@
 /usr/share/servicetypes/dcopmail.desktop
 ../icons/kmail.xpm /usr/share/pixmaps
 ../icons/kmail-16.xpm /usr/share/pixmaps
+../man/kmail_antivir.sh.1 /usr/share/man/man1
+../man/kmail_clamav.sh.1 /usr/share/man/man1
+../man/kmail_fprot.sh.1 /usr/share/man/man1
+../man/kmail_sav.sh.1 /usr/share/man/man1

Modified: branches/kde-3.4.0/packages/kdepim/debian/kmail.manpages
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/kmail.manpages	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/kmail.manpages	2005-03-11 08:30:55 UTC (rev 771)
@@ -1,5 +1 @@
 debian/man/kmail.1
-debian/man/kmail_antivir.sh.1
-debian/man/kmail_clamav.sh.1
-debian/man/kmail_fprot.sh.1
-debian/man/kmail_sav.sh.1

Modified: branches/kde-3.4.0/packages/kdepim/debian/knode.install
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/knode.install	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/knode.install	2005-03-11 08:30:55 UTC (rev 771)
@@ -3,6 +3,8 @@
 /usr/lib/kde3/kcm_knode.so
 /usr/lib/kde3/libknodepart.la
 /usr/lib/kde3/libknodepart.so
+/usr/lib/libknodecommon.la
+/usr/lib/libknodecommon.so
 /usr/share/applications/kde/KNode.desktop
 /usr/share/apps/knode
 /usr/share/doc/kde/HTML/en/knode

Modified: branches/kde-3.4.0/packages/kdepim/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/rules	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/rules	2005-03-11 08:30:55 UTC (rev 771)
@@ -57,6 +57,7 @@
 DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libktnef1 := -V'libktnef1 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libmimelib1 := -V'libmimelib1 (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_akregator := -V
 DEB_DH_MAKESHLIBS_ARGS_kaddressbook := -V
 DEB_DH_MAKESHLIBS_ARGS_kalarm := -V
 DEB_DH_MAKESHLIBS_ARGS_kdepim-wizards := -V
@@ -72,22 +73,26 @@
 DEB_DH_MAKESHLIBS_ARGS_ksync := -V
 DEB_DH_MAKESHLIBS_ARGS_ktnef := -V
 
-PKGS_WITH_LIBS := kaddressbook kalarm kdepim-wizards kitchensync kleopatra \
-	kmail knode knotes kode kontact korganizer kpilot ksync ktnef \
-	libkcal2a libkdenetwork2 libkdepim1 libkgantt0 libkleopatra0 \
+PKGS_WITH_LIBS := akregator kaddressbook kalarm kdepim-wizards kitchensync \
+	kleopatra kmail knode knotes kode kontact korganizer kpilot ksync \
+	ktnef libkcal2a libkdenetwork2 libkdepim1 libkgantt0 libkleopatra0 \
 	libkpimexchange1 libkpimexchange1 libkpimidentities1 libksieve0 \
 	libktnef1 libmimelib1
 DEB_SHLIBDEPS_INCLUDE := $(foreach p, $(PKGS_WITH_LIBS), debian/$(p)/usr/lib)
 
 # kontact starts fine without korganizer or kpilot dependencies
+# specialdates is only in recommends to get the kaddressbook dependency there
 DEB_DH_SHLIBDEPS_ARGS += $(DEB_DH_SHLIBDEPS_ARGS_$(cdbs_curpkg))
+kontact_recommends_plugins := korganizer specialdates
+kontact_suggests_plugins := journal kpilot todo
+
 DEB_DH_SHLIBDEPS_ARGS_kontact := \
-	-Xusr/lib/kde3/libkontact_korganizerplugin.so \
-	-Xusr/lib/kde3/libkontact_kpilotplugin.so \
-	-Xusr/lib/kde3/libkontact_todoplugin.so -- \
-	-dRecommends \
-	debian/kontact/usr/lib/kde3/libkontact_korganizerplugin.so \
-	debian/kontact/usr/lib/kde3/libkontact_todoplugin.so \
+	$(foreach p,$(kontact_recommends_plugins) $(kontact_suggests_plugins),-Xusr/lib/kde3/libkontact_$(p)plugin.so) \
+	-- -dRecommends \
+	$(foreach p,$(kontact_recommends_plugins),debian/kontact/usr/lib/kde3/libkontact_$(p)plugin.so) \
 	-dSuggests \
-	debian/kontact/usr/lib/kde3/libkontact_kpilotplugin.so \
+	$(foreach p,$(kontact_suggests_plugins),debian/kontact/usr/lib/kde3/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
+
+test-shlibdeps:
+	@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact)

Added: branches/kde-3.4.0/packages/kdepim/debian/shlibs.local
===================================================================
--- branches/kde-3.4.0/packages/kdepim/debian/shlibs.local	2005-03-10 20:09:15 UTC (rev 770)
+++ branches/kde-3.4.0/packages/kdepim/debian/shlibs.local	2005-03-11 08:30:55 UTC (rev 771)
@@ -0,0 +1,3 @@
+libakregatorprivate 0
+libkmailprivate 0
+libknodecommon 0