Move the kpgp library back to kdepim from kdepimlibs.

svn path=/trunk/KDE/kdepim/libkpgp/; revision=684900

CMakeLists.txt

@@ -215,7 +215,7 @@ kde4_add_kcfg_files(kmailprivate_LIB_SRCS globalsettings_base.kcfgc replyphrases
 
 kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS})
 
-target_link_libraries(kmailprivate ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KMIME_LIBS} ${KDE4_KPGP_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBS} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_KIMAP_LIBS} kdepim mimelib ksieve kleopatra)
+target_link_libraries(kmailprivate ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES} ${KDE4_KMIME_LIBS} ${KDE4_KPIMIDENTITIES_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KTNEF_LIBS} ${KDE4_KUTILS_LIBRARY} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_KIMAP_LIBS} kdepim mimelib ksieve kpgp kleopatra)
 
 set_target_properties(kmailprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kmailprivate  DESTINATION ${LIB_INSTALL_DIR})

keyresolver.h

@@ -41,7 +41,7 @@
 
 #include <kleo/enum.h>
 
-#include <kpgp/kpgp.h> // for Kpgp::Result
+#include <libkpgp/kpgp.h> // for Kpgp::Result
 #include <gpgmepp/key.h>
 
 #include <vector>

kmcomposewin.cpp

@@ -29,7 +29,7 @@
 #include "kmreadermainwin.h"
 #include "messagesender.h"
 #include "kmmsgpartdlg.h"
-#include <kpgp/kpgpblock.h>
+#include <libkpgp/kpgpblock.h>
 #include <kaddrbook.h>
 #include "kmaddrbook.h"
 #include "kmmsgdict.h"

kmkernel.cpp

@@ -60,7 +60,7 @@ using KMail::TemplateParser;
 #include <kapplication.h>
 #include <ksystemtrayicon.h>
 #include <kconfiggroup.h>
-#include <kpgp/kpgp.h>
+#include <libkpgp/kpgp.h>
 #include <kdebug.h>
 #include <kio/netaccess.h>
 #include <kwallet.h>

kmmessage.cpp

@@ -31,7 +31,7 @@ using KMail::TemplateParser;
 #include <kpimutils/email.h>
 
 #include <cryptplugwrapperlist.h>
-#include <kpgp/kpgpblock.h>
+#include <libkpgp/kpgpblock.h>
 #include <kaddrbook.h>
 
 #include <kglobal.h>

messagecomposer.cpp

@@ -74,7 +74,7 @@
 #include <kmime/kmime_util.h>
 #include <kmime/kmime_codecs.h>
 
-#include <kpgp/kpgpblock.h>
+#include <libkpgp/kpgpblock.h>
 #include <kconfiggroup.h>
 #include <kmessagebox.h>
 #include <klocale.h>

messagecomposer.h

@@ -41,7 +41,7 @@
 
 #include <mimelib/mediatyp.h>
 #include <kleo/cryptobackend.h>
-#include <kpgp/kpgp.h>
+#include <libkpgp/kpgp.h>
 
 #include <vector>
 

objecttreeparser.cpp

@@ -65,8 +65,8 @@
 
 #include <gpgmepp/importresult.h>
 
-#include <kpgp/kpgpblock.h>
-#include <kpgp/kpgp.h>
+#include <libkpgp/kpgpblock.h>
+#include <libkpgp/kpgp.h>
 #include <kpimutils/linklocator.h>
 using KPIMUtils::LinkLocator;
 

partmetadata.h

@@ -19,7 +19,7 @@
 
 #include <cryptplugwrapper.h>
 
-#include <kpgp/kpgp.h>
+#include <libkpgp/kpgp.h>
 #include <QString>
 #include <time.h>