rev 9761 - trunk/packages/kdepim/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2008-03-15 12:51:18 +0000 (Sat, 15 Mar 2008)
New Revision: 9761

Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/control.in
   trunk/packages/kdepim/debian/rules
Log:
fix third party kontact plugin usage

Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2008-03-15 10:29:28 UTC (rev 9760)
+++ trunk/packages/kdepim/debian/changelog	2008-03-15 12:51:18 UTC (rev 9761)
@@ -5,8 +5,13 @@
   * Add 19_karm_negative_time.diff patch to fix karm inconsistencies in
     handling of "negative" time specifications (mostly displayability issues)
     (Closes: #470613)
+  
+  +++ Changes by Sune Vuorela:
+  
+  * Add kontact plugin abi version and do nice magic around it.
+  * Add a conflicts against non-working basket integration.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 12 Mar 2008 14:28:08 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 15 Mar 2008 13:49:23 +0100
 
 kdepim (4:3.5.9-1) unstable; urgency=low
 

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2008-03-15 10:29:28 UTC (rev 9760)
+++ trunk/packages/kdepim/debian/control	2008-03-15 12:51:18 UTC (rev 9761)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Sune Vuorela <debian at pusling.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), automake (>= 1:1.10) | automake1.10,
  cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
@@ -315,7 +315,8 @@
 Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
 Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather, gnokii
 Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin
-Conflicts: akregator-kontact-plugin
+Conflicts: akregator-kontact-plugin, basket (<= 1.0.2-2)
+Provides: kontact-plugin-abi-${kontact:abi-provides}
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and

Modified: trunk/packages/kdepim/debian/control.in
===================================================================
--- trunk/packages/kdepim/debian/control.in	2008-03-15 10:29:28 UTC (rev 9760)
+++ trunk/packages/kdepim/debian/control.in	2008-03-15 12:51:18 UTC (rev 9761)
@@ -315,7 +315,8 @@
 Recommends: ${shlibs:Recommends}, kitchensync, kmail, knode, knotes
 Suggests: ${shlibs:Suggests}, akregator, knewsticker, kweather, gnokii
 Replaces: akregator (<< 4:3.4.0), akregator-kontact-plugin
-Conflicts: akregator-kontact-plugin
+Conflicts: akregator-kontact-plugin, basket (<= 1.0.2-2)
+Provides: kontact-plugin-abi-${kontact:abi-provides}
 Description: KDE pim application
  Kontact is the integrated solution to your personal information management
  needs. It combines KDE applications like KMail, KOrganizer, and

Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules	2008-03-15 10:29:28 UTC (rev 9760)
+++ trunk/packages/kdepim/debian/rules	2008-03-15 12:51:18 UTC (rev 9761)
@@ -8,6 +8,8 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+KONTACT_PLUGIN_ABI := $(shell echo $(shell grep KONTACT_PLUGIN_VERSION kontact/interfaces/plugin.h | sed 's/.*KONTACT_PLUGIN_VERSION//' ))
+
 DEB_KDE_CVS_MAKE := yes
 DEB_KDE_APIDOX := yes
 
@@ -47,7 +49,7 @@
 
 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.5.8
+shlibs_ver=4:3.5.9
 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))'
@@ -60,6 +62,7 @@
 DEB_DH_MAKESHLIBS_ARGS_libksieve0 := -V'libksieve0 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libktnef1 := -V'libktnef1 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a := -V'libmimelib1c2a (>= $(shlibs_ver))'
+DEB_DH_MAKESHLIBS_ARGS_kontact := -V'kontact (>= $(shlibs_ver)), kontact-plugin-abi-$(KONTACT_PLUGIN_ABI)' 
 
 PACKAGES_WITH_LIBS := akregator kaddressbook kalarm kdepim-kresources \
 	kdepim-wizards kitchensync kleopatra kmail knode knotes kode kontact \
@@ -94,6 +97,10 @@
 	debian/libkcal2b/usr/lib/kde3/kcal_kabc.so \
 	-dDepends
 
+binary-predeb/kontact::
+	@echo "kontact plugin:   " $(KONTACT_PLUGIN_ABI)
+	echo kontact:abi-provides=$(KONTACT_PLUGIN_ABI) >> debian/kontact.substvars
+
 test-shlibdeps:
 	@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact)