diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-08-20 22:17:03 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-08-20 22:17:03 -0400 |
| commit | 6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf (patch) | |
| tree | 141e44b1b831644c739f3ec4e0bef2d10ef71da7 /ubuntu/maverick/kdepim/debian/rules | |
| parent | 7621ba87b889eccdea4958715c25de4b403ad705 (diff) | |
| parent | 26f5630a822b38ef215210699e9e08e74143b38b (diff) | |
| download | tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.tar.gz tde-packaging-6f3a1bc646b0d5eb63f09e59e9b0262d47ee4ebf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/kdepim/debian/rules')
| -rwxr-xr-x | ubuntu/maverick/kdepim/debian/rules | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ubuntu/maverick/kdepim/debian/rules b/ubuntu/maverick/kdepim/debian/rules index 11b332f36..6d8c87f14 100755 --- a/ubuntu/maverick/kdepim/debian/rules +++ b/ubuntu/maverick/kdepim/debian/rules @@ -3,9 +3,9 @@ # Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function # Also include the main Trinity path ifeq ("$(LD_LIBRARY_PATH)", "") -LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/kde3 +LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/trinity else -LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/kde3 +LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib:debian/tmp/opt/trinity/lib/trinity endif export LD_LIBRARY_PATH @@ -49,11 +49,11 @@ kontact-trinity_recommends_plugins := korganizer-trinity specialdates kontact-trinity_suggests_plugins := journal kpilot-trinity todo DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ - $(foreach p,$(kontact-trinity_recommends_plugins) $(kontact-trinity_suggests_plugins),-Xopt/trinity/lib/kde3/libkontact_$(p)plugin.so) \ + $(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/kde3/libkontact_$(p)plugin.so) \ + $(foreach p,$(kontact-trinity_recommends_plugins),debian/kontact/opt/trinity/lib/trinity/libkontact_$(p)plugin.so) \ -dSuggests \ - $(foreach p,$(kontact-trinity_suggests_plugins),debian/kontact/opt/trinity/lib/kde3/libkontact_$(p)plugin.so) \ + $(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 libkabc_xmlrpc.so) to Recommends @@ -65,9 +65,9 @@ DEB_DH_SHLIBDEPS_ARGS_kontact-trinity := \ # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends #DEB_DH_SHLIBDEPS_ARGS_libkcal2b-trinity := \ -# -Xopt/trinity/lib/kde3/kcal_kabc.so \ +# -Xopt/trinity/lib/trinity/kcal_kabc.so \ # -- -dRecommends \ -# debian/libkcal2b/opt/trinity/lib/kde3/kcal_kabc.so \ +# debian/libkcal2b/opt/trinity/lib/trinity/kcal_kabc.so \ # -dDepends test-shlibdeps: |