summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-02-28 02:22:05 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-02-28 02:22:23 +0100
commit09668618ee6e992fb03148e0ecf85b3673f295bc (patch)
tree921fd73bf82e706d976a539f1a508d481144414e
parentba33c1b2115d01eb6e3f4d087d4cd2bb92ff7129 (diff)
downloadtde-packaging-09668618ee6e992fb03148e0ecf85b3673f295bc.tar.gz
tde-packaging-09668618ee6e992fb03148e0ecf85b3673f295bc.zip
Fix kontact plugins dependencies on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit b3368c164d11bbb87d68f937cf3e15b2a4fe8c85)
-rwxr-xr-xdebian/lenny/tdepim/debian/rules8
-rwxr-xr-xdebian/squeeze/tdepim/debian/rules8
-rwxr-xr-xubuntu/maverick/tdepim/debian/rules8
3 files changed, 12 insertions, 12 deletions
diff --git a/debian/lenny/tdepim/debian/rules b/debian/lenny/tdepim/debian/rules
index 697e9b0b2..7398b4251 100755
--- a/debian/lenny/tdepim/debian/rules
+++ b/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:
diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules
index db5c42cdb..d55a667b9 100755
--- a/debian/squeeze/tdepim/debian/rules
+++ b/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:
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index db5c42cdb..d55a667b9 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/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: