[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=3c89a19

The following commit has been merged in the master branch:
commit 3c89a19e83b8db6492d650b3511bcd1a46cc4a0e
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Mar 11 01:20:39 2011 +0100

    Remove unused code from CMakeList.txt and unused folder ontologies/
---
 CMakeLists.txt            | 31 ++++------------------------
 ontologies/CMakeLists.txt | 51 -----------------------------------------------
 2 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 344812e..9d8ab75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,23 +12,6 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/build/con
 set(KDE_MIN_VERSION "4.4.75")
 find_package (KDE4 4.4.75 REQUIRED)
 find_package (TelepathyQt4 REQUIRED)
-# find_package (KTelepathy REQUIRED)
-#find_package (Nepomuk REQUIRED)
-
-# Find telepathy.trig, which is installed already by telepathy-integration-daemon.
-# find_file (TELEPATHY_TRIG_SOURCE
-#            telepathy.trig
-#            PATHS "${DATA_INSTALL_DIR}" "${KDE4_DATA_DIR}" "${CMAKE_INSTALL_PREFIX}/share"
-#            ENV XDG_DATA_DIRS
-#            PATH_SUFFIXES "ontology/telepathy"
-# )
-
-# We depend on telepathy.trig, so fail horribly if it's not found.${CMAKE_MODULE_PATH}
-# if (NOT TELEPATHY_TRIG_SOURCE)
-#     message (ERROR_FATAL
-#              "Could not find telepathy.trig Telepathy source file. You must install telepathy-integration-daemon before trying to build this program."
-#     )
-# endif (NOT TELEPATHY_TRIG_SOURCE)
 
 include (KDE4Defaults)
 include (MacroLibrary)
@@ -38,19 +21,14 @@ add_definitions (${KDE4_DEFINITIONS}
 
 include_directories (${KDE4_INCLUDES}
                      ${TELEPATHY_QT4_INCLUDE_DIR}
-#                      ${NEPOMUK_INCLUDES}
-#                      ${KTELEPATHY_INCLUDE_DIRS}
-#                      "${CMAKE_CURRENT_BINARY_DIR}/ontologies"
 )
 
-# add_subdirectory (ontologies)
-
-set (contactlist_SRCS 
-     contactviewhoverbutton.cpp 
-     contactoverlays.cpp 
+set (contactlist_SRCS
+     contactviewhoverbutton.cpp
+     contactoverlays.cpp
      contactdelegateoverlay.cpp
      contactdelegate.cpp
-     accountbutton.cpp 
+     accountbutton.cpp
      accounts-model.cpp
      accountfiltermodel.cpp
      contact-model-item.cpp
@@ -68,7 +46,6 @@ kde4_add_ui_files (contactlist_SRCS
 
 kde4_add_executable (telepathy-kde-contactlist
                      ${contactlist_SRCS}
-
 )
 
 target_link_libraries (telepathy-kde-contactlist
diff --git a/ontologies/CMakeLists.txt b/ontologies/CMakeLists.txt
deleted file mode 100644
index 3e0bbe8..0000000
--- a/ontologies/CMakeLists.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-# Build the nie static lib here so the tests can use it too.
-nepomuk_add_ontology_classes (telepathynie_SRCS
-                              ONTOLOGIES
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nmo.trig
-                              ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig
-                              ${TELEPATHY_TRIG_SOURCE}
-)
-
-# Add the ontologies we want to build the vocabulary for.
-soprano_add_ontology (pimo_ontology_SRCS
-                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig
-                      "PIMO"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
-
-soprano_add_ontology (nco_ontology_SRCS
-                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nco.trig
-                      "NCO"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
-
-soprano_add_ontology (nao_ontology_SRCS
-                      ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nao.trig
-                      "NAO"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
-
-soprano_add_ontology (telepathy_ontology_SRCS
-                      ${TELEPATHY_TRIG_SOURCE}
-                      "Telepathy"
-                      "Nepomuk::Vocabulary"
-                      "trig"
-)
-
-kde4_add_library (ontologies
-                  STATIC
-                  ${telepathynie_SRCS}
-                  ${pimo_ontology_SRCS}
-                  ${nco_ontology_SRCS}
-                  ${nao_ontology_SRCS}
-                  ${telepathy_ontology_SRCS}
-)
-
-set_property(TARGET ontologies PROPERTY COMPILE_FLAGS -fPIC)
-

-- 
ktp-contact-list packaging