summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdepim/debian/rules
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-22 13:16:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-22 13:16:17 -0600
commitcd046fcfe14f7ece0852f8b2614d1eb912e05617 (patch)
tree0a8e6c37ca629514bcf80d51bd6f55d8be08941c /ubuntu/maverick/tdepim/debian/rules
parent3b70e3c52399effdeb514679275b97d15dac669f (diff)
parent61fd4b9a795fa246b0822553f8cadae48c1d7a18 (diff)
downloadtde-packaging-cd046fcfe14f7ece0852f8b2614d1eb912e05617.tar.gz
tde-packaging-cd046fcfe14f7ece0852f8b2614d1eb912e05617.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdepim/debian/rules')
-rwxr-xr-xubuntu/maverick/tdepim/debian/rules15
1 files changed, 0 insertions, 15 deletions
diff --git a/ubuntu/maverick/tdepim/debian/rules b/ubuntu/maverick/tdepim/debian/rules
index 135929c4e..25005d459 100755
--- a/ubuntu/maverick/tdepim/debian/rules
+++ b/ubuntu/maverick/tdepim/debian/rules
@@ -37,7 +37,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
shlibs_ver=4:3.5.7
DEB_DH_MAKESHLIBS_ARGS_libindex0-trinity := -V'libindex0-trinity (>= $(shlibs_ver))'
-DEB_DH_MAKESHLIBS_ARGS_libkcal2b-trinity := -V'libkcal2b-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdenetwork2-trinity := -V'libtdenetwork2-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libtdepim1a-trinity := -V'libtdepim1a-trinity (>= $(shlibs_ver))'
DEB_DH_MAKESHLIBS_ARGS_libkgantt0-trinity := -V'libkgantt0-trinity (>= $(shlibs_ver))'
@@ -62,20 +61,6 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \
$(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \
-dDepends # Since -u args go first in dpkg-shlibdeps call
-## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends
-#DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \
-# -Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \
-# -- -dRecommends \
-# debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \
-# -dDepends
-#
-## Move kaddressbook dependency of libkcal2b-trinity to Recommends
-#DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \
-# -Xopt/trinity/lib/trinity/kcal_tdeabc.so \
-# -- -dRecommends \
-# debian/libkcal2b/opt/trinity/lib/trinity/kcal_tdeabc.so \
-# -dDepends
-
test-shlibdeps:
@echo $(DEB_DH_SHLIBDEPS_ARGS_kontact-trinity)