From c5d3623b7544beb48876e32c9b102cad5058d283 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Feb 2013 02:32:38 -0600 Subject: Fix tdepim packaging on Debian and Ubuntu --- debian/squeeze/tdepim/debian/rules | 6 +-- .../debian/tdepim-tderesources-trinity.install | 48 +++++++++++----------- .../tdepim/debian/tdepim-trinity-dev.install | 20 ++++----- 3 files changed, 37 insertions(+), 37 deletions(-) (limited to 'debian/squeeze') diff --git a/debian/squeeze/tdepim/debian/rules b/debian/squeeze/tdepim/debian/rules index 96073e510..0ef053d14 100755 --- a/debian/squeeze/tdepim/debian/rules +++ b/debian/squeeze/tdepim/debian/rules @@ -62,11 +62,11 @@ 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 libkabc_xmlrpc.so) to Recommends +## Move kaddressbook-trinity dependency (from libtdeabc_xmlrpc.so) to Recommends #DEB_DH_SHLIBDEPS_ARGS_tdepim-tderesources-trinity := \ -# -Xopt/lib/trinity/libkabc_xmlrpc.so.1 \ +# -Xopt/lib/trinity/libtdeabc_xmlrpc.so.1 \ # -- -dRecommends \ -# debian/tdepim-tderesources/opt/trinity/lib/libkabc_xmlrpc.so.1.* \ +# debian/tdepim-tderesources/opt/trinity/lib/libtdeabc_xmlrpc.so.1.* \ # -dDepends # ## Move kaddressbook dependency of libkcal2b-trinity to Recommends diff --git a/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install index 48b4fec45..1c261d798 100644 --- a/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install +++ b/debian/squeeze/tdepim/debian/tdepim-tderesources-trinity.install @@ -1,9 +1,9 @@ -/opt/trinity/lib/trinity/kabc_*.la -/opt/trinity/lib/trinity/kabc_*.so +/opt/trinity/lib/trinity/tdeabc_*.la +/opt/trinity/lib/trinity/tdeabc_*.so /opt/trinity/lib/trinity/kcal_caldav.la /opt/trinity/lib/trinity/kcal_caldav.so -/opt/trinity/lib/trinity/kabc_carddav.la -/opt/trinity/lib/trinity/kabc_carddav.so +/opt/trinity/lib/trinity/tdeabc_carddav.la +/opt/trinity/lib/trinity/tdeabc_carddav.so /opt/trinity/lib/trinity/kcal_groupdav.la /opt/trinity/lib/trinity/kcal_groupdav.so /opt/trinity/lib/trinity/kcal_groupwise.la @@ -30,24 +30,24 @@ /opt/trinity/lib/libkabckolab.so.0.0.0 /opt/trinity/lib/libkabcscalix.so.0 /opt/trinity/lib/libkabcscalix.so.0.0.0 -/opt/trinity/lib/libkabc_groupdav.so.1 -/opt/trinity/lib/libkabc_groupdav.so.1.0.0 -/opt/trinity/lib/libkabc_groupwise.so.1 -/opt/trinity/lib/libkabc_groupwise.so.1.0.0 -/opt/trinity/lib/libkabc_newexchange.so.1 -/opt/trinity/lib/libkabc_newexchange.so.1.0.0 -/opt/trinity/lib/libkabc_slox.so.0 -/opt/trinity/lib/libkabc_slox.so.0.0.0 -/opt/trinity/lib/libkabc_xmlrpc.so.1 -/opt/trinity/lib/libkabc_xmlrpc.so.1.0.0 +/opt/trinity/lib/libtdeabc_groupdav.so.1 +/opt/trinity/lib/libtdeabc_groupdav.so.1.0.0 +/opt/trinity/lib/libtdeabc_groupwise.so.1 +/opt/trinity/lib/libtdeabc_groupwise.so.1.0.0 +/opt/trinity/lib/libtdeabc_newexchange.so.1 +/opt/trinity/lib/libtdeabc_newexchange.so.1.0.0 +/opt/trinity/lib/libtdeabc_slox.so.0 +/opt/trinity/lib/libtdeabc_slox.so.0.0.0 +/opt/trinity/lib/libtdeabc_xmlrpc.so.1 +/opt/trinity/lib/libtdeabc_xmlrpc.so.1.0.0 /opt/trinity/lib/libkcalkolab.so.0 /opt/trinity/lib/libkcalkolab.so.0.0.0 /opt/trinity/lib/libkcalscalix.so.0 /opt/trinity/lib/libkcalscalix.so.0.0.0 /opt/trinity/lib/libkcal_caldav.so.1 /opt/trinity/lib/libkcal_caldav.so.1.0.0 -/opt/trinity/lib/libkabc_carddav.so.1 -/opt/trinity/lib/libkabc_carddav.so.1.0.0 +/opt/trinity/lib/libtdeabc_carddav.so.1 +/opt/trinity/lib/libtdeabc_carddav.so.1.0.0 /opt/trinity/lib/libkcal_groupdav.so.1 /opt/trinity/lib/libkcal_groupdav.so.1.0.0 /opt/trinity/lib/libkcal_groupwise.so.1 @@ -74,18 +74,18 @@ /opt/trinity/lib/libkslox.so.0.0.0 /opt/trinity/lib/libgwsoap.so.0 /opt/trinity/lib/libgwsoap.so.0.0.0 -/opt/trinity/share/services/tderesources/tdeabc/kabc_groupdav.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_groupwise.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_newexchange.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_opengroupware.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_ox.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_slox.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_xmlrpc.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupdav.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_groupwise.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_newexchange.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_opengroupware.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_ox.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_slox.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_xmlrpc.desktop /opt/trinity/share/services/tderesources/tdeabc/kolab.desktop /opt/trinity/share/services/tderesources/tdeabc/scalix.desktop /opt/trinity/share/services/tderesources/kcal/exchange.desktop /opt/trinity/share/services/tderesources/kcal/kcal_caldav.desktop -/opt/trinity/share/services/tderesources/tdeabc/kabc_carddav.desktop +/opt/trinity/share/services/tderesources/tdeabc/tdeabc_carddav.desktop /opt/trinity/share/services/tderesources/kcal/kcal_groupdav.desktop /opt/trinity/share/services/tderesources/kcal/kcal_groupwise.desktop /opt/trinity/share/services/tderesources/kcal/kcal_newexchange.desktop diff --git a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install index bec38f84a..d6d241210 100644 --- a/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install +++ b/debian/squeeze/tdepim/debian/tdepim-trinity-dev.install @@ -14,16 +14,16 @@ /opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libkabcscalix.la /opt/trinity/lib/libkabcscalix.so -/opt/trinity/lib/libkabc_groupdav.la -/opt/trinity/lib/libkabc_groupdav.so -/opt/trinity/lib/libkabc_groupwise.la -/opt/trinity/lib/libkabc_groupwise.so -/opt/trinity/lib/libkabc_newexchange.la -/opt/trinity/lib/libkabc_newexchange.so -/opt/trinity/lib/libkabc_slox.la -/opt/trinity/lib/libkabc_slox.so -/opt/trinity/lib/libkabc_xmlrpc.la -/opt/trinity/lib/libkabc_xmlrpc.so +/opt/trinity/lib/libtdeabc_groupdav.la +/opt/trinity/lib/libtdeabc_groupdav.so +/opt/trinity/lib/libtdeabc_groupwise.la +/opt/trinity/lib/libtdeabc_groupwise.so +/opt/trinity/lib/libtdeabc_newexchange.la +/opt/trinity/lib/libtdeabc_newexchange.so +/opt/trinity/lib/libtdeabc_slox.la +/opt/trinity/lib/libtdeabc_slox.so +/opt/trinity/lib/libtdeabc_xmlrpc.la +/opt/trinity/lib/libtdeabc_xmlrpc.so /opt/trinity/lib/libkabinterfaces.la /opt/trinity/lib/libkabinterfaces.so /opt/trinity/lib/libkaddressbook.la -- cgit v1.2.1