Fix kontact plugins dependencies on Debian and Ubuntu

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

debian/lenny/tdepim/debian/rules

@@ -75,15 +75,15 @@ DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a-trinity := -V'libmimelib1c2a-trinity (>= $
 
 # kontact-trinity starts fine without korganizer-trinity or kpilot-trinity dependencies
 # specialdates-trinity is only in recommends to get the kaddressbook-trinity dependency there
-kontact-trinity_recommends_plugins := korganizer-trinity specialdates
-kontact-trinity_suggests_plugins := journal kpilot-trinity todo
+kontact-trinity_recommends_plugins := korganizer specialdates
+kontact-trinity_suggests_plugins := journal kpilot todo
 
 DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-- -dRecommends \
-	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact-trinity/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dSuggests \
-	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact-trinity/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 test-shlibdeps:

debian/squeeze/tdepim/debian/rules

@@ -75,15 +75,15 @@ DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a-trinity := -V'libmimelib1c2a-trinity (>= $
 
 # kontact-trinity starts fine without korganizer-trinity or kpilot-trinity dependencies
 # specialdates-trinity is only in recommends to get the kaddressbook-trinity dependency there
-kontact-trinity_recommends_plugins := korganizer-trinity specialdates
-kontact-trinity_suggests_plugins := journal kpilot-trinity todo
+kontact-trinity_recommends_plugins := korganizer specialdates
+kontact-trinity_suggests_plugins := journal kpilot todo
 
 DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-- -dRecommends \
-	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact-trinity/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dSuggests \
-	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact-trinity/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 test-shlibdeps:

ubuntu/maverick/tdepim/debian/rules

@@ -75,15 +75,15 @@ DEB_DH_MAKESHLIBS_ARGS_libmimelib1c2a-trinity := -V'libmimelib1c2a-trinity (>= $
 
 # kontact-trinity starts fine without korganizer-trinity or kpilot-trinity dependencies
 # specialdates-trinity is only in recommends to get the kaddressbook-trinity dependency there
-kontact-trinity_recommends_plugins := korganizer-trinity specialdates
-kontact-trinity_suggests_plugins := journal kpilot-trinity todo
+kontact-trinity_recommends_plugins := korganizer specialdates
+kontact-trinity_suggests_plugins := journal kpilot todo
 
 DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
 	$(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-- -dRecommends \
-	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact-trinity/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dSuggests \
-	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
+	$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact-trinity/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
 	-dDepends	# Since -u args go first in dpkg-shlibdeps call
 
 test-shlibdeps: