From 6a4d740eea85a9438cb4763e37eec925574d532e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 18 Feb 2017 23:09:51 +0900 Subject: [PATCH] DEB tdepim: fixed FTBFS caused by suggested but missing kpilot plugin. Signed-off-by: Michele Calgaro (cherry picked from commit 5c78a78f2b09875e82915818513a7167ba5efea9) --- debian/lenny/tdepim/debian/rules | 2 +- debian/squeeze/tdepim/debian/rules | 2 +- ubuntu/maverick/tdepim/debian/rules | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules index 7398b4251..1e7824373 100755 --- a/debian/lenny/tdepim/debian/rules +++ b/debian/lenny/tdepim/debian/rules @@ -76,7 +76,7 @@ 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 specialdates -kontact-trinity_suggests_plugins := journal kpilot todo +kontact-trinity_suggests_plugins := journal 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) \ diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules index d55a667b9..1da0c08ab 100755 --- a/debian/squeeze/tdepim/debian/rules +++ b/debian/squeeze/tdepim/debian/rules @@ -76,7 +76,7 @@ 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 specialdates -kontact-trinity_suggests_plugins := journal kpilot todo +kontact-trinity_suggests_plugins := journal 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) \ diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules index d55a667b9..1da0c08ab 100755 --- a/ubuntu/maverick/tdepim/debian/rules +++ b/ubuntu/maverick/tdepim/debian/rules @@ -76,7 +76,7 @@ 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 specialdates -kontact-trinity_suggests_plugins := journal kpilot todo +kontact-trinity_suggests_plugins := journal 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) \