From caec720262f96a2f835991e6239d49de222fffcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 15 Feb 2014 19:17:46 +0100 Subject: Fix files conflict in kopete package on Debian and Ubuntu --- .../tdenetwork/debian/kopete-trinity.install | 39 +++++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) (limited to 'ubuntu/precise') diff --git a/ubuntu/precise/tdenetwork/debian/kopete-trinity.install b/ubuntu/precise/tdenetwork/debian/kopete-trinity.install index 06cfd1e75..7d5c96219 100644 --- a/ubuntu/precise/tdenetwork/debian/kopete-trinity.install +++ b/ubuntu/precise/tdenetwork/debian/kopete-trinity.install @@ -117,7 +117,12 @@ debian/tmp/opt/trinity/share/apps/kopete/icons debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128 debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/kopete_avdevice.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/meanwhile_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/testbed_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/wp_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16 debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions @@ -126,6 +131,7 @@ debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy. debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy_d.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_con.mng debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_connecting.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_description_overlay.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_ignored.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi_d.png @@ -142,6 +148,10 @@ debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key2.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key3.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/logging.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_away.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_dnd.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_idle.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/meanwhile_unknown.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png @@ -154,6 +164,7 @@ debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_newm debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/wp_away.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng @@ -164,38 +175,61 @@ debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_te debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/groupwise_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/meanwhile_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/testbed_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/wp_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22 debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/actions debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/actions/logging.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/actions/yahoo_stealthed.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/apps debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/apps/groupwise_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/apps/kopete_avdevice.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/22x22/apps/meanwhile_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32 debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/actions debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/actions/logging.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/actions/yahoo_stealthed.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/gadu_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/groupwise_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/kopete_avdevice.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/latex.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/meanwhile_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/smpppdcs.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/testbed_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/wp_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48 debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/actions debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/actions/logging.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/groupwise_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/meanwhile_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/testbed_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/wp_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64 debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/actions debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/actions/logging.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/groupwise_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/kopete_avdevice.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/meanwhile_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/testbed_protocol.png +debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/wp_protocol.png debian/tmp/opt/trinity/share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png debian/tmp/opt/trinity/share/apps/kopete/ircchatui.rc debian/tmp/opt/trinity/share/apps/kopete/ircnetworks.xml @@ -389,10 +423,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/actions/webcamsend.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/aim_protocol.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/icq_protocol.png debian/tmp/opt/trinity/share/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz -debian/tmp/opt/trinity/share/icons/hicolor debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/kopete.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16 -debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/aim_away.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/aim_connecting.mng debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/aim_offline.png @@ -425,7 +456,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/kopeteaway.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/newmsg.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/status_unknown.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/actions/status_unknown_overlay.png -debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/aim_protocol.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/icq_protocol.png debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/jabber_protocol.png @@ -436,7 +466,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kopete.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/actions/kopeteavailable.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/actions/kopeteaway.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/actions/newmessage.mng -debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/aim_protocol.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/icq_protocol.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/jabber_protocol.png -- cgit v1.2.3