summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/applications/koffice/debian
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-08 12:18:40 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-08 12:18:40 +0200
commit22bcb2f1bd4f894ab82aec3201bdd672a9cedb45 (patch)
tree89a4599019f91cb2981352ebd1d1f02e1e95bf50 /ubuntu/raring/applications/koffice/debian
parent442b14b852d6c156a43d2ecb88e304a514800960 (diff)
parent424e979d8a2e10edd215b055c3fcbf89369e4c4e (diff)
downloadtde-packaging-22bcb2f1bd4f894ab82aec3201bdd672a9cedb45.tar.gz
tde-packaging-22bcb2f1bd4f894ab82aec3201bdd672a9cedb45.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/raring/applications/koffice/debian')
-rw-r--r--ubuntu/raring/applications/koffice/debian/kword-data-trinity.install2
-rw-r--r--ubuntu/raring/applications/koffice/debian/kword-trinity.install4
2 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/raring/applications/koffice/debian/kword-data-trinity.install b/ubuntu/raring/applications/koffice/debian/kword-data-trinity.install
index 7c702418e..2d273a850 100644
--- a/ubuntu/raring/applications/koffice/debian/kword-data-trinity.install
+++ b/ubuntu/raring/applications/koffice/debian/kword-data-trinity.install
@@ -10,7 +10,7 @@ debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/22x22/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/kword.png
debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kword.png
-debian/tmp/opt/trinity/share/services/kwmailmerge_kabc.desktop
+debian/tmp/opt/trinity/share/services/kwmailmerge_tdeabc.desktop
debian/tmp/opt/trinity/share/services/kwmailmerge_kspread.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_export.desktop
debian/tmp/opt/trinity/share/services/kword_abiword_import.desktop
diff --git a/ubuntu/raring/applications/koffice/debian/kword-trinity.install b/ubuntu/raring/applications/koffice/debian/kword-trinity.install
index 7f3f2f954..dfeb77b97 100644
--- a/ubuntu/raring/applications/koffice/debian/kword-trinity.install
+++ b/ubuntu/raring/applications/koffice/debian/kword-trinity.install
@@ -1,8 +1,8 @@
debian/tmp/opt/trinity/bin/kword
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_classic.so
-debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.la
-debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kabc.so
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.la
+debian/tmp/opt/trinity/lib/trinity/kwmailmerge_tdeabc.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.la
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_kspread.so
debian/tmp/opt/trinity/lib/trinity/kwmailmerge_qtsqldb.la