[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bplasma-mobile=5D_dataengines/metadata=3A_merge?=
From:       Sebastian_Kügler <sebas () kde ! org>
Date:       2011-04-20 18:25:02
Message-ID: 20110420182502.C9608A609B () git ! kde ! org
[Download RAW message or body]

Git commit cbf59eff7afadb9aab0e9b56f2d33490dfcde7f8 by Sebastian Kügler.
Committed on 20/04/2011 at 20:27.
Pushed by sebas into branch 'master'.

merge

M  +4    -4    dataengines/metadata/CMakeLists.txt     
A  +27   -0    dataengines/metadata/plasma-engine-active-metadata.desktop         \
[License: UNKNOWN]  * D  +0    -27   \
dataengines/metadata/plasma-engine-metadata.desktop     

The files marked with a * at the end have a non valid license. Please read: \
http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are \
listed at that page.


http://commits.kde.org/plasma-mobile/cbf59eff7afadb9aab0e9b56f2d33490dfcde7f8

diff --git a/dataengines/metadata/CMakeLists.txt \
b/dataengines/metadata/CMakeLists.txt index 993fea0..328d9b0 100644
--- a/dataengines/metadata/CMakeLists.txt
+++ b/dataengines/metadata/CMakeLists.txt
@@ -19,9 +19,9 @@ set(metadataengine_srcs
     metadataengine.cpp
 )
 
-kde4_add_plugin(plasma_engine_metadata ${metadataengine_srcs})
+kde4_add_plugin(plasma_engine_active_metadata ${metadataengine_srcs})
 
-target_link_libraries(plasma_engine_metadata
+target_link_libraries(plasma_engine_active_metadata
     ${KDE4_KDECORE_LIBS}
     ${KDE4_PLASMA_LIBS}
     ${KDE4_KIO_LIBS}
@@ -31,6 +31,6 @@ target_link_libraries(plasma_engine_metadata
     ${SOPRANO_CLIENT_LIBRARIES}
 )
 
-install(TARGETS plasma_engine_metadata DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-engine-metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS plasma_engine_active_metadata DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES plasma-engine-active-metadata.desktop DESTINATION \
${SERVICES_INSTALL_DIR})  
diff --git a/dataengines/metadata/plasma-engine-active-metadata.desktop \
b/dataengines/metadata/plasma-engine-active-metadata.desktop new file mode 100644
index 0000000..a619b76
--- /dev/null
+++ b/dataengines/metadata/plasma-engine-active-metadata.desktop
@@ -0,0 +1,27 @@
+[Desktop Entry]
+Name=Active Metadata
+Name[nl]=Metagegevens
+Name[et]=Metaandmed
+Name[pt]=Meta-dados
+Name[sv]=Metadata
+Name[uk]=Метадані
+Name[x-test]=xxMetadataxx
+Comment=Provides metadata for semantic resources
+Comment[et]=Semantiliste ressursside metaandmed
+Comment[nl]=Levert metagegevens voor semantische hulpbronnen
+Comment[pt]=Fornece meta-dados para os recursos semânticos
+Comment[sv]=Tillhandahåller metadata för semantiska resurser
+Comment[uk]=Надає метадані для семантичних \
ресурсів +Comment[x-test]=xxProvides metadata for semantic resourcesxx
+X-KDE-ServiceTypes=Plasma/DataEngine
+Type=Service
+Icon=nepomuk
+X-KDE-Library=plasma_engine_active_metadata
+X-KDE-PluginInfo-Author=Sebastian Kügler
+X-KDE-PluginInfo-Email=sebas@kde.org
+X-KDE-PluginInfo-Name=active_metadata
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://kde.org
+X-KDE-PluginInfo-Category=Utilities
+X-KDE-PluginInfo-Depends=
+
diff --git a/dataengines/metadata/plasma-engine-metadata.desktop \
b/dataengines/metadata/plasma-engine-metadata.desktop deleted file mode 100644
index 40340e1..0000000
--- a/dataengines/metadata/plasma-engine-metadata.desktop
+++ /dev/null
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Name=Metadata
-Name[et]=Metaandmed
-Name[nl]=Metagegevens
-Name[pt]=Meta-dados
-Name[sv]=Metadata
-Name[uk]=Метадані
-Name[x-test]=xxMetadataxx
-Comment=Provides metadata for semantic resources
-Comment[et]=Semantiliste ressursside metaandmed
-Comment[nl]=Levert metagegevens voor semantische hulpbronnen
-Comment[pt]=Fornece meta-dados para os recursos semânticos
-Comment[sv]=Tillhandahåller metadata för semantiska resurser
-Comment[uk]=Надає метадані для семантичних \
                ресурсів
-Comment[x-test]=xxProvides metadata for semantic resourcesxx
-X-KDE-ServiceTypes=Plasma/DataEngine
-Type=Service
-Icon=nepomuk
-X-KDE-Library=plasma_engine_metadata
-X-KDE-PluginInfo-Author=Sebastian Kügler
-X-KDE-PluginInfo-Email=sebas@kde.org
-X-KDE-PluginInfo-Name=metadata
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://kde.org
-X-KDE-PluginInfo-Category=Utilities
-X-KDE-PluginInfo-Depends=
-


[prev in list] [next in list] [prev in thread] [next in thread]