diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-11-22 18:49:14 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-11-22 18:49:14 +0100 |
| commit | 61fd4b9a795fa246b0822553f8cadae48c1d7a18 (patch) | |
| tree | c61a0c13faad60a188161d10b05e75a61a5d39b0 /ubuntu/maverick/tdepim/debian/rules | |
| parent | 42aa1eb3360c60f6f1266b2945b4eb4f3df8e3cf (diff) | |
| download | tde-packaging-61fd4b9a795fa246b0822553f8cadae48c1d7a18.tar.gz tde-packaging-61fd4b9a795fa246b0822553f8cadae48c1d7a18.zip | |
Merge package libkcal2 into libtdepim1 on Debian and Ubuntu
This resolves circular dependency - Bug 2197
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu/maverick/tdepim/debian/rules')
| -rwxr-xr-x | ubuntu/maverick/tdepim/debian/rules | 15 |
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) |