[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=18dcffe

The following commit has been merged in the master branch:
commit 18dcffe0164b0f2d4d52d781ce0853d15e41bdeb
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Mar 4 17:52:20 2010 +0000

    Don't ship a copy of telepathy.trig anymore, but use the one installed by t-i-d.
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1098933
---
 CMakeLists.txt     | 18 +++++++++++++++++-
 nie/CMakeLists.txt |  2 +-
 telepathy.trig     | 48 ------------------------------------------------
 3 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02f1d4d..c74b9aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,22 @@ if (NOT NCO_TRIG_SOURCE)
     )
 endif (NOT NCO_TRIG_SOURCE)
 
+# 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}"
+           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)
+
+
 add_definitions (${KDE4_DEFINITIONS})
 
 include_directories (${KDE4_INCLUDES}
@@ -73,7 +89,7 @@ nepomuk_add_ontology_classes (contactlist_NEPOMUK_SRCS
 
 soprano_add_ontology(nco_SRCS ${NCO_TRIG_SOURCE} "NCO" "Nepomuk::Vocabulary" "trig")
 soprano_add_ontology(pimo_SRCS ${PIMO_TRIG_SOURCE} "PIMO" "Nepomuk::Vocabulary" "trig")
-soprano_add_ontology(telepathy_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/telepathy.trig "Telepathy" "Nepomuk::Vocabulary" "trig")
+soprano_add_ontology(telepathy_SRCS ${TELEPATHY_TRIG_SOURCE} "Telepathy" "Nepomuk::Vocabulary" "trig")
 
 kde4_add_executable (telepathy_contactlist_prototype
                      ${contactlist_SRCS}
diff --git a/nie/CMakeLists.txt b/nie/CMakeLists.txt
index 66024b4..f03b8fb 100644
--- a/nie/CMakeLists.txt
+++ b/nie/CMakeLists.txt
@@ -8,7 +8,7 @@ nepomuk_add_ontology_classes (nie_SRCS
                               ${CMAKE_CURRENT_SOURCE_DIR}/nfo.rdfs
                               ${CMAKE_CURRENT_SOURCE_DIR}/nco.rdfs
                               ${CMAKE_CURRENT_SOURCE_DIR}/nmo.rdfs
-                              ${CMAKE_CURRENT_SOURCE_DIR}/../telepathy.trig
+                              ${TELEPATHY_TRIG_SOURCE}
 )
 
 kde4_add_library (nie
diff --git a/telepathy.trig b/telepathy.trig
deleted file mode 100644
index db4d327..0000000
--- a/telepathy.trig
+++ /dev/null
@@ -1,48 +0,0 @@
- at prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
- at prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
- at prefix telepathy:     <http://nepomuk.kde.org/ontologies/2009/06/20/telepathy#> .
- at prefix nao:     <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
- at prefix nrl:     <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
- at prefix nco:     <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#> .
- at prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-
-telepathy: {telepathy:accountIdentifier
-     a rdf:Property ;
-          rdfs:subPropertyOf nao:identifier ;
-          rdfs:comment "Identifier of a Local Telepathy Account (as given by the Telepathy Account Manaager).";
-          rdfs:domain nco:IMAccount ;
-          rdfs:label "accountIdentifier" ;
-          rdfs:range xsd:string .
-
-            telepathy:statusType
-     a rdf:Property ;
-          rdfs:comment "The current presence type as defined by the Telepathy Spec. Invalid values (by the Telepathy spec) should be considered as 0, Unset.";
-          rdfs:domain nco:IMAccount ;
-          rdfs:label "statusType" ;
-          rdfs:range xsd:integer .
-
-            telepathy:isBuddyOf
-        a       rdf:Property ;
-          rdfs:comment "Indicates the local IM Account on whose buddy list this IM Account appears." ;
-          rdfs:domain nco:IMAccount ;
-          rdfs:label "isBuddyOf" ;
-          rdfs:range nco:IMAccount .
-}
-
-<http://nepomuk.kde.org/ontologies/2009/06/20/telepathy/metadata>
-{
-    <http://nepomuk.kde.org/ontologies/2009/06/20/telepathy>
-          a       nrl:DocumentGraph , nrl:Ontology ;
-          nao:hasDefaultNamespace "http://nepomuk.kde.org/ontologies/2009/06/20/telepathy#" ;
-          nao:hasDefaultNamespaceAbbreviation "telepathy" ;
-          nao:lastModified "2009-06-20T20:46:32.866Z" ;
-          nao:serializationLanguage "TriG" ;
-          nao:status "Testing" ;
-          nrl:updatable "0" ;
-          nao:version "1" .
-
-    <http://nepomuk.kde.org/ontologies/2009/06/20/telepathy/metadata>
-          a       nrl:GraphMetadata , nrl:Ontology ;
-          nao:serializationLanguage "TriG" ;
-          nrl:coreGraphMetadataFor <http://nepomuk.kde.org/ontologies/2009/06/20/telepathy> .
-}

-- 
ktp-contact-list packaging