From a15448c070e58d41c8d7c6cde49d082a379f704b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 16 Feb 2013 17:31:31 -0600
Subject: Fix FTBFS

---
 tdeabc/CMakeLists.txt         |  2 +-
 tdeabc/Makefile.am            | 18 +++++-----
 tdeabc/kabc_manager.desktop   | 76 -------------------------------------------
 tdeabc/tdeabc_manager.desktop | 76 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 tdeabc/kabc_manager.desktop
 create mode 100644 tdeabc/tdeabc_manager.desktop

diff --git a/tdeabc/CMakeLists.txt b/tdeabc/CMakeLists.txt
index e0ec832d0..0cd900c08 100644
--- a/tdeabc/CMakeLists.txt
+++ b/tdeabc/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES
 ##### other data ################################
 
 install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
-install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
+install( FILES tdeabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
 install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/tdeabc )
 
 
diff --git a/tdeabc/Makefile.am b/tdeabc/Makefile.am
index afdace9a9..a1f1d1b74 100644
--- a/tdeabc/Makefile.am
+++ b/tdeabc/Makefile.am
@@ -19,13 +19,13 @@ addressee.cpp addressee.h field.cpp: \
 
 CLEANFILES = addressee.h addressee.cpp field.cpp
 
-lib_LTLIBRARIES = libkabc.la
-libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
-libkabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
+lib_LTLIBRARIES = libtdeabc.la
+libtdeabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
+libtdeabc_la_LIBADD = vcard/libvcard.la vcardparser/libvcards.la $(LIB_KIO) \
                     $(top_builddir)/tderesources/libtderesources.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_la_COMPILE_FIRST = addressee.h
+libtdeabc_la_COMPILE_FIRST = addressee.h
 
-libkabc_la_SOURCES = \
+libtdeabc_la_SOURCES = \
   address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \
   distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \
   errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \
@@ -38,8 +38,8 @@ libkabc_la_SOURCES = \
   sortmode.cpp
 
 
-kabcincludedir = $(includedir)/tdeabc
-kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
   agent.h distributionlist.h distributionlistdialog.h distributionlisteditor.h \
   errorhandler.h field.h format.h formatfactory.h formatplugin.h geo.h key.h \
   phonenumber.h picture.h plugin.h resource.h \
@@ -53,13 +53,13 @@ METASOURCES = AUTO
 bin_PROGRAMS = tdeab2tdeabc
 
 tdeab2tdeabc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-tdeab2tdeabc_LDADD = libkabc.la ../kab/libkab.la
+tdeab2tdeabc_LDADD = libtdeabc.la ../kab/libkab.la
 tdeab2tdeabc_SOURCES = tdeab2tdeabc.cpp
 
 autostart_DATA = tdeab2tdeabc.desktop
 autostartdir = $(datadir)/autostart
 
-manager_DATA = kabc_manager.desktop
+manager_DATA = tdeabc_manager.desktop
 managerdir = $(kde_servicesdir)/tderesources
 
 DOXYGEN_REFERENCES = tdecore tdeui
diff --git a/tdeabc/kabc_manager.desktop b/tdeabc/kabc_manager.desktop
deleted file mode 100644
index 0af910f52..000000000
--- a/tdeabc/kabc_manager.desktop
+++ /dev/null
@@ -1,76 +0,0 @@
-[Desktop Entry]
-Name=Contacts
-Name[af]=Kontakte
-Name[ar]=المراسلين
-Name[be]=Кантакты
-Name[br]=Darempredoù
-Name[bs]=Kontakti
-Name[ca]=Contactes
-Name[cs]=Kontakty
-Name[csb]=Łączbë
-Name[cy]=Cysylltau
-Name[da]=Kontakter
-Name[de]=Kontakte
-Name[el]=Επαφές
-Name[eo]=Kontaktoj
-Name[es]=Contactos
-Name[et]=Kontaktid
-Name[eu]=Kontaktuak
-Name[fa]=تماسها
-Name[fi]=Yhteystiedot
-Name[fy]=Kontakten
-Name[ga]=Teagmhálacha
-Name[gl]=Contactos
-Name[he]=אנשי קשר
-Name[hi]=सम्पर्क
-Name[hr]=Kontakti
-Name[hsb]=Adresy
-Name[hu]=Névjegyek
-Name[id]=Kontak
-Name[is]=Tengiliðir
-Name[it]=Contatti
-Name[ja]=コンタクト
-Name[ka]=კონტაქტები
-Name[kk]=Контакттар
-Name[km]=ទំនាក់ទំនង
-Name[ku]=Tekilî
-Name[lb]=Kontakter
-Name[lt]=Kontaktai
-Name[lv]=Kontakti
-Name[mk]=Контакти
-Name[ms]=Hubungan
-Name[nb]=Kontakter
-Name[nds]=Kontakten
-Name[ne]=सम्पर्क
-Name[nl]=Contactpersonen
-Name[nn]=Kontaktar
-Name[pa]=ਸੰਪਰਕ
-Name[pl]=Kontakty
-Name[pt]=Contactos
-Name[pt_BR]=Contatos
-Name[ro]=Contacte
-Name[ru]=Контакты
-Name[rw]=Amaderesi
-Name[se]=Oktavuođat
-Name[sk]=Kontakty
-Name[sl]=Stiki
-Name[sr]=Контакти
-Name[sr@Latn]=Kontakti
-Name[sv]=Kontakter
-Name[ta]=தொடர்புகள்
-Name[te]=సంప్రదింపులు
-Name[tg]=Алоқаҳо
-Name[th]=รายชื่อติดต่อ
-Name[tr]=Bağlantılar
-Name[tt]=Elemtälär
-Name[uk]=Контакти
-Name[uz]=Aloqalar
-Name[uz@cyrillic]=Алоқалар
-Name[vi]=Liên lạc
-Name[zh_CN]=联系人
-Name[zh_HK]=聯絡人
-Name[zh_TW]=聯絡人
-Type=Service
-ServiceTypes=KResources/Manager
-
-X-TDE-ResourceFamily=contact
diff --git a/tdeabc/tdeabc_manager.desktop b/tdeabc/tdeabc_manager.desktop
new file mode 100644
index 000000000..0af910f52
--- /dev/null
+++ b/tdeabc/tdeabc_manager.desktop
@@ -0,0 +1,76 @@
+[Desktop Entry]
+Name=Contacts
+Name[af]=Kontakte
+Name[ar]=المراسلين
+Name[be]=Кантакты
+Name[br]=Darempredoù
+Name[bs]=Kontakti
+Name[ca]=Contactes
+Name[cs]=Kontakty
+Name[csb]=Łączbë
+Name[cy]=Cysylltau
+Name[da]=Kontakter
+Name[de]=Kontakte
+Name[el]=Επαφές
+Name[eo]=Kontaktoj
+Name[es]=Contactos
+Name[et]=Kontaktid
+Name[eu]=Kontaktuak
+Name[fa]=تماسها
+Name[fi]=Yhteystiedot
+Name[fy]=Kontakten
+Name[ga]=Teagmhálacha
+Name[gl]=Contactos
+Name[he]=אנשי קשר
+Name[hi]=सम्पर्क
+Name[hr]=Kontakti
+Name[hsb]=Adresy
+Name[hu]=Névjegyek
+Name[id]=Kontak
+Name[is]=Tengiliðir
+Name[it]=Contatti
+Name[ja]=コンタクト
+Name[ka]=კონტაქტები
+Name[kk]=Контакттар
+Name[km]=ទំនាក់ទំនង
+Name[ku]=Tekilî
+Name[lb]=Kontakter
+Name[lt]=Kontaktai
+Name[lv]=Kontakti
+Name[mk]=Контакти
+Name[ms]=Hubungan
+Name[nb]=Kontakter
+Name[nds]=Kontakten
+Name[ne]=सम्पर्क
+Name[nl]=Contactpersonen
+Name[nn]=Kontaktar
+Name[pa]=ਸੰਪਰਕ
+Name[pl]=Kontakty
+Name[pt]=Contactos
+Name[pt_BR]=Contatos
+Name[ro]=Contacte
+Name[ru]=Контакты
+Name[rw]=Amaderesi
+Name[se]=Oktavuođat
+Name[sk]=Kontakty
+Name[sl]=Stiki
+Name[sr]=Контакти
+Name[sr@Latn]=Kontakti
+Name[sv]=Kontakter
+Name[ta]=தொடர்புகள்
+Name[te]=సంప్రదింపులు
+Name[tg]=Алоқаҳо
+Name[th]=รายชื่อติดต่อ
+Name[tr]=Bağlantılar
+Name[tt]=Elemtälär
+Name[uk]=Контакти
+Name[uz]=Aloqalar
+Name[uz@cyrillic]=Алоқалар
+Name[vi]=Liên lạc
+Name[zh_CN]=联系人
+Name[zh_HK]=聯絡人
+Name[zh_TW]=聯絡人
+Type=Service
+ServiceTypes=KResources/Manager
+
+X-TDE-ResourceFamily=contact
-- 
cgit v1.2.1