[nepomuktvnamer/f17] Initial import
Daniel Vrátil
dvratil at fedoraproject.org
Wed Dec 26 11:30:54 UTC 2012
commit 42daaaf96a9bcc7dd2254f066b6efb40653e6ef0
Author: Dan Vrátil <dvratil at redhat.com>
Date: Wed Dec 26 03:21:13 2012 +0100
Initial import
.gitignore | 1 +
nepomuktvnamer-nepomuk2-port.patch | 2191 ++++++++++++++++++++++++++++++++++++
nepomuktvnamer.spec | 61 +
sources | 1 +
4 files changed, 2254 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..ab02dbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/nepomuktvnamer-0.2.0.tar.bz2
diff --git a/nepomuktvnamer-nepomuk2-port.patch b/nepomuktvnamer-nepomuk2-port.patch
new file mode 100644
index 0000000..cdd6031
--- /dev/null
+++ b/nepomuktvnamer-nepomuk2-port.patch
@@ -0,0 +1,2191 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index 435ba9a..bc3783d 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -9,19 +9,18 @@ set(CMAKE_NEPOMUKTVNAMER_VERSION "${CMAKE_NEPOMUKTVNAMER_VERSION_MAJOR}.${CMAKE_
+
+ set(KDE_MIN_VERSION "4.5.80") # for the < 4.2 macro
+ find_package(KDE4 4.5.80 REQUIRED)
+-find_package(Nepomuk REQUIRED)
++find_package(NepomukCore REQUIRED)
+ find_package(LibTvdb REQUIRED)
+ set(SDO_MIN_VERSION "0.8.53")
+ find_package(SharedDesktopOntologies)
+
+ include(KDE4Defaults)
+-include(SopranoAddOntology)
+
+ include_directories(
+ ${QT_INCLUDES}
+ ${KDE4_INCLUDES}
+ ${SOPRANO_INCLUDE_DIR}
+- ${NEPOMUK_INCLUDE_DIR}
++ ${NEPOMUK_CORE_INCLUDE_DIR}
+ )
+
+ add_subdirectory(src)
+diff --git kioslave/CMakeLists.txt kioslave/CMakeLists.txt
+index cd5b44d..657601c 100644
+--- kioslave/CMakeLists.txt
++++ kioslave/CMakeLists.txt
+@@ -6,15 +6,14 @@ set(kio_tvshow_PART_SRCS
+ kde4_add_plugin(kio_tvshow ${kio_tvshow_PART_SRCS})
+ target_link_libraries(kio_tvshow
+ ${KDE4_KIO_LIBS}
+- ${NEPOMUK_LIBRARIES}
+- ${NEPOMUK_QUERY_LIBRARIES}
++ ${NEPOMUK_CORE_LIBRARY}
+ ${SOPRANO_LIBRARIES}
+ )
+
+ kde4_add_plugin(nepomuktvshowthumbnail tvshowthumbcreator.cpp)
+ target_link_libraries(nepomuktvshowthumbnail
+ ${KDE4_KIO_LIBS}
+- ${NEPOMUK_LIBRARIES}
++ ${NEPOMUK_CORE_LIBRARY}
+ ${SOPRANO_LIBRARIES})
+
+ install(TARGETS kio_tvshow nepomuktvshowthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
+diff --git kioslave/kio_tvshow.cpp kioslave/kio_tvshow.cpp
+index 646eafe..7febe9d 100644
+--- kioslave/kio_tvshow.cpp
++++ kioslave/kio_tvshow.cpp
+@@ -20,15 +20,15 @@
+
+ #include "kio_tvshow.h"
+
+-#include <Nepomuk/ResourceManager>
+-#include <Nepomuk/Vocabulary/NMM>
+-#include <Nepomuk/Vocabulary/NIE>
+-#include <Nepomuk/Vocabulary/NFO>
+-#include <Nepomuk/Query/FileQuery>
+-#include <Nepomuk/Query/ComparisonTerm>
+-#include <Nepomuk/Query/ResourceTypeTerm>
+-#include <Nepomuk/Query/LiteralTerm>
+-#include <Nepomuk/Query/AndTerm>
++#include <Nepomuk2/ResourceManager>
++#include <Nepomuk2/Vocabulary/NMM>
++#include <Nepomuk2/Vocabulary/NIE>
++#include <Nepomuk2/Vocabulary/NFO>
++#include <Nepomuk2/Query/FileQuery>
++#include <Nepomuk2/Query/ComparisonTerm>
++#include <Nepomuk2/Query/ResourceTypeTerm>
++#include <Nepomuk2/Query/LiteralTerm>
++#include <Nepomuk2/Query/AndTerm>
+
+ #include <KUrl>
+ #include <kio/global.h>
+@@ -49,8 +49,11 @@
+ #include <QtCore/QCoreApplication>
+ #include <QStringList>
+
++#include <sys/types.h>
++#include <unistd.h>
++
+ using namespace KIO;
+-using namespace Nepomuk::Vocabulary;
++using namespace Nepomuk2::Vocabulary;
+ using namespace Soprano::Vocabulary;
+
+
+@@ -85,24 +88,24 @@ namespace {
+ }
+
+
+-Nepomuk::TvshowProtocol::TvshowProtocol( const QByteArray& poolSocket, const QByteArray& appSocket )
++Nepomuk2::TvshowProtocol::TvshowProtocol( const QByteArray& poolSocket, const QByteArray& appSocket )
+ : KIO::SlaveBase( "tvshow", poolSocket, appSocket )
+ {
+ }
+
+
+-Nepomuk::TvshowProtocol::~TvshowProtocol()
++Nepomuk2::TvshowProtocol::~TvshowProtocol()
+ {
+ }
+
+
+-void Nepomuk::TvshowProtocol::listDir( const KUrl& url )
++void Nepomuk2::TvshowProtocol::listDir( const KUrl& url )
+ {
+ // root folder
+ if(url.path().length() <= 1) {
+ // list all tv shows including title, description, and an optional depiction (for now we simply take one of them)
+ Soprano::QueryResultIterator it
+- = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct ?r ?t ?d where { "
++ = Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct ?r ?t ?d where { "
+ "?r a %1 . "
+ "?r %2 ?t . "
+ "?r %3 ?d . "
+@@ -133,7 +136,7 @@ void Nepomuk::TvshowProtocol::listDir( const KUrl& url )
+ if(pathTokens.count() == 1) {
+ // list one TV Series: list seasons
+ Soprano::QueryResultIterator it
+- = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct ?s where { "
++ = Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct ?s where { "
+ "?r nmm:series ?tv . "
+ "?tv nie:title %1 . "
+ "?r nmm:season ?s . }")
+@@ -151,7 +154,7 @@ void Nepomuk::TvshowProtocol::listDir( const KUrl& url )
+ const QString seriesTitle = pathTokens[0];
+ const int season = pathTokens[1].mid(pathTokens[1].lastIndexOf(' ')+1).toInt();
+ Soprano::QueryResultIterator it
+- = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct * where { "
++ = Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct * where { "
+ "?r a nmm:TVShow ; "
+ "nmm:season %1 ; "
+ "nmm:series [ nie:title %2 ] ; "
+@@ -186,20 +189,20 @@ void Nepomuk::TvshowProtocol::listDir( const KUrl& url )
+ }
+
+
+-void Nepomuk::TvshowProtocol::mkdir( const KUrl &url, int permissions )
++void Nepomuk2::TvshowProtocol::mkdir( const KUrl &url, int permissions )
+ {
+ Q_UNUSED(permissions);
+ error( ERR_UNSUPPORTED_ACTION, url.prettyUrl() );
+ }
+
+
+-void Nepomuk::TvshowProtocol::get( const KUrl& url )
++void Nepomuk2::TvshowProtocol::get( const KUrl& url )
+ {
+ error( ERR_UNSUPPORTED_ACTION, url.prettyUrl() );
+ }
+
+
+-void Nepomuk::TvshowProtocol::put( const KUrl& url, int permissions, KIO::JobFlags flags )
++void Nepomuk2::TvshowProtocol::put( const KUrl& url, int permissions, KIO::JobFlags flags )
+ {
+ Q_UNUSED(permissions);
+ Q_UNUSED(flags);
+@@ -208,7 +211,7 @@ void Nepomuk::TvshowProtocol::put( const KUrl& url, int permissions, KIO::JobFla
+ }
+
+
+-void Nepomuk::TvshowProtocol::copy( const KUrl& src, const KUrl& dest, int permissions, KIO::JobFlags flags )
++void Nepomuk2::TvshowProtocol::copy( const KUrl& src, const KUrl& dest, int permissions, KIO::JobFlags flags )
+ {
+ Q_UNUSED(src);
+ Q_UNUSED(dest);
+@@ -219,7 +222,7 @@ void Nepomuk::TvshowProtocol::copy( const KUrl& src, const KUrl& dest, int permi
+ }
+
+
+-void Nepomuk::TvshowProtocol::rename( const KUrl& src, const KUrl& dest, KIO::JobFlags flags )
++void Nepomuk2::TvshowProtocol::rename( const KUrl& src, const KUrl& dest, KIO::JobFlags flags )
+ {
+ Q_UNUSED(src);
+ Q_UNUSED(dest);
+@@ -229,28 +232,28 @@ void Nepomuk::TvshowProtocol::rename( const KUrl& src, const KUrl& dest, KIO::Jo
+ }
+
+
+-void Nepomuk::TvshowProtocol::del( const KUrl& url, bool isfile )
++void Nepomuk2::TvshowProtocol::del( const KUrl& url, bool isfile )
+ {
+ Q_UNUSED(isfile);
+ error( ERR_UNSUPPORTED_ACTION, url.prettyUrl() );
+ }
+
+
+-void Nepomuk::TvshowProtocol::mimetype( const KUrl& url )
++void Nepomuk2::TvshowProtocol::mimetype( const KUrl& url )
+ {
+ // FIXME
+ error( ERR_UNSUPPORTED_ACTION, url.prettyUrl() );
+ }
+
+
+-void Nepomuk::TvshowProtocol::stat( const KUrl& url )
++void Nepomuk2::TvshowProtocol::stat( const KUrl& url )
+ {
+ // for basic functionality we only need to stat the folders
+ const QStringList pathTokens = url.path().split('/', QString::SkipEmptyParts);
+ if(pathTokens.count() == 1) {
+ // stat series folder
+ Soprano::QueryResultIterator it
+- = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct * where { "
++ = Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select distinct * where { "
+ "?r a nmm:TVSeries ; "
+ "nie:title %1 ; "
+ "nao:created ?cd ; "
+@@ -298,7 +301,7 @@ extern "C"
+ exit(-1);
+ }
+
+- Nepomuk::TvshowProtocol slave(argv[2], argv[3]);
++ Nepomuk2::TvshowProtocol slave(argv[2], argv[3]);
+ slave.dispatchLoop();
+
+ kDebug(7102) << "Tvshow slave Done";
+diff --git kioslave/kio_tvshow.h kioslave/kio_tvshow.h
+index 476a725..7f44e38 100644
+--- kioslave/kio_tvshow.h
++++ kioslave/kio_tvshow.h
+@@ -25,7 +25,7 @@
+
+ #include <QtCore/QDate>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ class TvshowProtocol : public KIO::SlaveBase
+ {
+ public:
+diff --git kioslave/tvshowthumbcreator.cpp kioslave/tvshowthumbcreator.cpp
+index 94172c7..5c192cf 100644
+--- kioslave/tvshowthumbcreator.cpp
++++ kioslave/tvshowthumbcreator.cpp
+@@ -21,10 +21,10 @@
+
+ #include "tvshowthumbcreator.h"
+
+-#include <Nepomuk/ResourceManager>
+-#include <Nepomuk/Vocabulary/NFO>
+-#include <Nepomuk/Vocabulary/NMM>
+-#include <Nepomuk/Vocabulary/NIE>
++#include <Nepomuk2/ResourceManager>
++#include <Nepomuk2/Vocabulary/NFO>
++#include <Nepomuk2/Vocabulary/NMM>
++#include <Nepomuk2/Vocabulary/NIE>
+
+ #include <Soprano/QueryResultIterator>
+ #include <Soprano/Node>
+@@ -59,7 +59,7 @@ bool TVShowThumbCreator::create(const QString &path, int width, int height, QIma
+ // we query the depiction which has the best aspect ratio: the rough heuristic is an image which is higher than it is wide
+ const QString seriesName = pathTokens[0];
+ Soprano::QueryResultIterator it
+- = Nepomuk::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select ?u where { "
++ = Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(QString::fromLatin1("select ?u where { "
+ "?r a nmm:TVSeries ; "
+ "nie:title %1 ; "
+ "nfo:depiction ?d . "
+diff --git service/CMakeLists.txt service/CMakeLists.txt
+index e958084..71ee20c 100644
+--- service/CMakeLists.txt
++++ service/CMakeLists.txt
+@@ -10,9 +10,7 @@ target_link_libraries(nepomuktvnamerservice
+ ${KDE4_KDEUI_LIBS}
+ ${KDE4_KIO_LIBS}
+ ${SOPRANO_LIBRARIES}
+- #nepomukcore
+- ${NEPOMUK_LIBRARIES}
+- nepomukdatamanagement
++ ${NEPOMUK_CORE_LIBRARY}
+ )
+
+ install(
+diff --git service/tvnamerservice.cpp service/tvnamerservice.cpp
+index 13105c0..f6ab1a4 100644
+--- service/tvnamerservice.cpp
++++ service/tvnamerservice.cpp
+@@ -21,9 +21,9 @@
+
+ #include "tvnamerservice.h"
+
+-#include <nepomuk/resourcewatcher.h>
+-#include <Nepomuk/Vocabulary/NFO>
+-#include <Nepomuk/File>
++#include <nepomuk2/resourcewatcher.h>
++#include <Nepomuk2/Vocabulary/NFO>
++#include <Nepomuk2/File>
+
+ #include <QtCore/QProcess>
+ #include <QFile>
+@@ -31,16 +31,16 @@
+ #include <KStandardDirs>
+ #include <KDebug>
+
+-using namespace Nepomuk::Vocabulary;
++using namespace Nepomuk2::Vocabulary;
+
+ TVNamerService::TVNamerService(QObject *parent, const QVariantList &)
+- : Nepomuk::Service(parent)
++ : Nepomuk2::Service(parent)
+ {
+ // set up the watcher for newly created nfo:Video resources
+- Nepomuk::ResourceWatcher* watcher = new Nepomuk::ResourceWatcher(this);
++ Nepomuk2::ResourceWatcher* watcher = new Nepomuk2::ResourceWatcher(this);
+ watcher->addType(NFO::Video());
+- connect(watcher, SIGNAL(resourceCreated(Nepomuk::Resource,QList<QUrl>)),
+- this, SLOT(slotResourceCreated(Nepomuk::Resource,QList<QUrl>)));
++ connect(watcher, SIGNAL(resourceCreated(Nepomuk2::Resource,QList<QUrl>)),
++ this, SLOT(slotResourceCreated(Nepomuk2::Resource,QList<QUrl>)));
+ watcher->start();
+ }
+
+@@ -48,9 +48,9 @@ TVNamerService::~TVNamerService()
+ {
+ }
+
+-void TVNamerService::slotResourceCreated(const Nepomuk::Resource &res, const QList<QUrl> &types)
++void TVNamerService::slotResourceCreated(const Nepomuk2::Resource &res, const QList<QUrl> &types)
+ {
+- kDebug() << res.resourceUri() << types;
++ kDebug() << res.uri() << types;
+ // all we need to do is call the nepomuktvnamer executable on the newly created file
+ if(res.isFile()) {
+ const QString path = res.toFile().url().toLocalFile();
+diff --git service/tvnamerservice.h service/tvnamerservice.h
+index 2799ba6..30d0e28 100644
+--- service/tvnamerservice.h
++++ service/tvnamerservice.h
+@@ -1,5 +1,5 @@
+ /*
+- This file is part of the Nepomuk KDE project.
++ This file is part of the Nepomuk2 KDE project.
+ Copyright (C) 2011 Sebastian Trueg <trueg at kde.org>
+
+ This library is free software; you can redistribute it and/or
+@@ -22,14 +22,14 @@
+ #ifndef TVNAMERSERVICE_H
+ #define TVNAMERSERVICE_H
+
+-#include <Nepomuk/Service>
+-#include <Nepomuk/Resource>
++#include <Nepomuk2/Service>
++#include <Nepomuk2/Resource>
+
+ #include <QtCore/QList>
+ #include <QtCore/QUrl>
+
+
+-class TVNamerService : public Nepomuk::Service
++class TVNamerService : public Nepomuk2::Service
+ {
+ Q_OBJECT
+
+@@ -38,7 +38,7 @@ public:
+ ~TVNamerService();
+
+ private Q_SLOTS:
+- void slotResourceCreated(const Nepomuk::Resource& res, const QList<QUrl>& types);
++ void slotResourceCreated(const Nepomuk2::Resource& res, const QList<QUrl>& types);
+ };
+
+ #endif // TVNAMERSERVICE_H
+diff --git src/CMakeLists.txt src/CMakeLists.txt
+index bcc63a2..6625f62 100644
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -18,10 +18,7 @@ target_link_libraries(nepomuktvnamer
+ ${KDE4_KIO_LIBS}
+ ${SOPRANO_LIBRARIES}
+ ${LIBTVDB_LIBRARIES}
+- ${NEPOMUK_LIBRARIES}
+- ${NEPOMUK_QUERY_LIBRARIES}
+- nepomukdatamanagement
+- #nepomukcore
++ ${NEPOMUK_CORE_LIBRARY}
+ )
+
+ install(TARGETS nepomuktvnamer ${INSTALL_TARGETS_DEFAULT_ARGS})
+diff --git src/nco/affiliation.h src/nco/affiliation.h
+index 2e70497..4a80604 100644
+--- src/nco/affiliation.h
++++ src/nco/affiliation.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/role.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Aggregates three properties defined in RFC2426. Originally
+diff --git src/nco/audioimaccount.h src/nco/audioimaccount.h
+index 253853f..f78b105 100644
+--- src/nco/audioimaccount.h
++++ src/nco/audioimaccount.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/imaccount.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Deprecated in favour of nco:imCapabilityAudio.
+diff --git src/nco/bbsnumber.h src/nco/bbsnumber.h
+index 4c7eddb..847fb24 100644
+--- src/nco/bbsnumber.h
++++ src/nco/bbsnumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/modemnumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A Bulletin Board System (BBS) phone number. Inspired by the
+diff --git src/nco/carphonenumber.h src/nco/carphonenumber.h
+index a685dab..6baa0fa 100644
+--- src/nco/carphonenumber.h
++++ src/nco/carphonenumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/voicephonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A car phone number. Inspired by the (TYPE=car) parameter of
+diff --git src/nco/cellphonenumber.h src/nco/cellphonenumber.h
+index 63ae8e0..bd47c2a 100644
+--- src/nco/cellphonenumber.h
++++ src/nco/cellphonenumber.h
+@@ -8,12 +8,12 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/voicephonenumber.h"
+ #include "nco/messagingnumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A cellular phone number. Inspired by the (TYPE=cell) parameter
+diff --git src/nco/contact.h src/nco/contact.h
+index 8a0e829..c8cd242 100644
+--- src/nco/contact.h
++++ src/nco/contact.h
+@@ -8,12 +8,12 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+ #include "nco/role.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A Contact. A piece of data that can provide means to identify
+diff --git src/nco/contactgroup.h src/nco/contactgroup.h
+index d4661ba..4c30459 100644
+--- src/nco/contactgroup.h
++++ src/nco/contactgroup.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A group of Contacts. Could be used to express a group in an addressbook
+diff --git src/nco/contactlist.h src/nco/contactlist.h
+index 829be32..3e767ec 100644
+--- src/nco/contactlist.h
++++ src/nco/contactlist.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A contact list, this class represents an addressbook or a contact
+diff --git src/nco/contactlistdataobject.h src/nco/contactlistdataobject.h
+index 50b580a..88de618 100644
+--- src/nco/contactlistdataobject.h
++++ src/nco/contactlistdataobject.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * An entity occuring on a contact list (usually interpreted as
+diff --git src/nco/contactmedium.h src/nco/contactmedium.h
+index 662de16..18cd025 100644
+--- src/nco/contactmedium.h
++++ src/nco/contactmedium.h
+@@ -8,9 +8,9 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A superclass for all contact media - ways to contact an entity
+@@ -26,7 +26,7 @@ namespace NCO {
+ * whereas media with TYPE=work parameter should be attached
+ * to nco:Affiliation or nco:OrganizationContact.
+ */
+-class ContactMedium : public virtual Nepomuk::SimpleResource
++class ContactMedium : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ ContactMedium(const QUrl& uri = QUrl())
+diff --git src/nco/domesticdeliveryaddress.h src/nco/domesticdeliveryaddress.h
+index 012dc39..7dedd5d 100644
+--- src/nco/domesticdeliveryaddress.h
++++ src/nco/domesticdeliveryaddress.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/postaladdress.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Domestic Delivery Addresse. Class inspired by TYPE=dom parameter
+diff --git src/nco/emailaddress.h src/nco/emailaddress.h
+index 60ca5eb..489f473 100644
+--- src/nco/emailaddress.h
++++ src/nco/emailaddress.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/contactmedium.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * An email address. The recommended best practice is to use mailto:
+diff --git src/nco/faxnumber.h src/nco/faxnumber.h
+index 2515e46..ba86717 100644
+--- src/nco/faxnumber.h
++++ src/nco/faxnumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/phonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A fax number. Inspired by the (TYPE=fax) parameter of the TEL
+diff --git src/nco/gender.h src/nco/gender.h
+index 259ffbd..745036f 100644
+--- src/nco/gender.h
++++ src/nco/gender.h
+@@ -8,14 +8,14 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Gender. Instances of this class may include male and female.
+ */
+-class Gender : public virtual Nepomuk::SimpleResource
++class Gender : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ Gender(const QUrl& uri = QUrl())
+diff --git src/nco/imaccount.h src/nco/imaccount.h
+index d32c441..b5ed857 100644
+--- src/nco/imaccount.h
++++ src/nco/imaccount.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/contactmedium.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * An account in an Instant Messaging system.
+diff --git src/nco/imcapability.h src/nco/imcapability.h
+index 23040e3..7502654 100644
+--- src/nco/imcapability.h
++++ src/nco/imcapability.h
+@@ -8,14 +8,14 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Capabilities of a cetain IMAccount.
+ */
+-class IMCapability : public virtual Nepomuk::SimpleResource
++class IMCapability : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ IMCapability(const QUrl& uri = QUrl())
+diff --git src/nco/imstatustype.h src/nco/imstatustype.h
+index b76d92d..975ac0a 100644
+--- src/nco/imstatustype.h
++++ src/nco/imstatustype.h
+@@ -8,15 +8,15 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * The status type of an IMAccount. Based on the Connection_Presence_Type
+ * enumeration of the Telepathy project: http://telepathy.freedesktop.org/spec/Connection_Interface_Simple_Presence.html#Enum:Connection_Presence_Type
+ */
+-class IMStatusType : public virtual Nepomuk::SimpleResource
++class IMStatusType : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ IMStatusType(const QUrl& uri = QUrl())
+diff --git src/nco/internationaldeliveryaddress.h src/nco/internationaldeliveryaddress.h
+index e425ce1..8467867 100644
+--- src/nco/internationaldeliveryaddress.h
++++ src/nco/internationaldeliveryaddress.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/postaladdress.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * International Delivery Addresse. Class inspired by TYPE=intl
+diff --git src/nco/isdnnumber.h src/nco/isdnnumber.h
+index f9bd194..9aad1c5 100644
+--- src/nco/isdnnumber.h
++++ src/nco/isdnnumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/voicephonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * An ISDN phone number. Inspired by the (TYPE=isdn) parameter
+diff --git src/nco/messagingnumber.h src/nco/messagingnumber.h
+index ef95396..fab0f26 100644
+--- src/nco/messagingnumber.h
++++ src/nco/messagingnumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/phonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A number that can accept textual messages.
+diff --git src/nco/modemnumber.h src/nco/modemnumber.h
+index 7b6baf9..0398672 100644
+--- src/nco/modemnumber.h
++++ src/nco/modemnumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/phonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A modem phone number. Inspired by the (TYPE=modem) parameter
+diff --git src/nco/organizationcontact.h src/nco/organizationcontact.h
+index 822b64e..40a629e 100644
+--- src/nco/organizationcontact.h
++++ src/nco/organizationcontact.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/contact.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A Contact that denotes on Organization.
+diff --git src/nco/pagernumber.h src/nco/pagernumber.h
+index 6aaa5cc..dcdee57 100644
+--- src/nco/pagernumber.h
++++ src/nco/pagernumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/messagingnumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A pager phone number. Inspired by the (TYPE=pager) parameter
+diff --git src/nco/parceldeliveryaddress.h src/nco/parceldeliveryaddress.h
+index ba397d2..be35618 100644
+--- src/nco/parceldeliveryaddress.h
++++ src/nco/parceldeliveryaddress.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/postaladdress.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Parcel Delivery Addresse. Class inspired by TYPE=parcel parameter
+diff --git src/nco/pcsnumber.h src/nco/pcsnumber.h
+index 618d08b..e80dc99 100644
+--- src/nco/pcsnumber.h
++++ src/nco/pcsnumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/voicephonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Personal Communication Services Number. A class inspired
+diff --git src/nco/personcontact.h src/nco/personcontact.h
+index 50bddab..068e8d6 100644
+--- src/nco/personcontact.h
++++ src/nco/personcontact.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/contact.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A Contact that denotes a Person. A person can have multiple Affiliations.
+diff --git src/nco/phonenumber.h src/nco/phonenumber.h
+index 47b0cfe..45b8b26 100644
+--- src/nco/phonenumber.h
++++ src/nco/phonenumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/contactmedium.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A telephone number.
+diff --git src/nco/postaladdress.h src/nco/postaladdress.h
+index da0cc66..2c0ed16 100644
+--- src/nco/postaladdress.h
++++ src/nco/postaladdress.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/contactmedium.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A postal address. A class aggregating the various parts of a
+diff --git src/nco/role.h src/nco/role.h
+index 10d97fd..f941d29 100644
+--- src/nco/role.h
++++ src/nco/role.h
+@@ -8,9 +8,9 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A role played by a contact. Contacts that denote people, can
+@@ -19,7 +19,7 @@ namespace NCO {
+ * usually have one role. Each role can introduce additional contact
+ * media.
+ */
+-class Role : public virtual Nepomuk::SimpleResource
++class Role : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ Role(const QUrl& uri = QUrl())
+diff --git src/nco/videoimaccount.h src/nco/videoimaccount.h
+index de5007b..99fe086 100644
+--- src/nco/videoimaccount.h
++++ src/nco/videoimaccount.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/audioimaccount.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * Deprecated in favour of nco:imCapabilityVideo.
+diff --git src/nco/videotelephonenumber.h src/nco/videotelephonenumber.h
+index 6a617f9..0ed7510 100644
+--- src/nco/videotelephonenumber.h
++++ src/nco/videotelephonenumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/voicephonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A Video telephone number. A class inspired by the TYPE=video
+diff --git src/nco/voicephonenumber.h src/nco/voicephonenumber.h
+index 6aec303..9abcc48 100644
+--- src/nco/voicephonenumber.h
++++ src/nco/voicephonenumber.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nco/phonenumber.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NCO {
+ /**
+ * A telephone number with voice communication capabilities.
+diff --git src/nfo/application.h src/nfo/application.h
+index a899cf1..65dac1e 100644
+--- src/nfo/application.h
++++ src/nfo/application.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/software.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An application
+diff --git src/nfo/archive.h src/nfo/archive.h
+index 7365eb2..2eede69 100644
+--- src/nfo/archive.h
++++ src/nfo/archive.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/datacontainer.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A compressed file. May contain other files or folder inside.
+diff --git src/nfo/archiveitem.h src/nfo/archiveitem.h
+index 646b4ef..3ab0ec8 100644
+--- src/nfo/archiveitem.h
++++ src/nfo/archiveitem.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/embeddedfiledataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file entity inside an archive.
+diff --git src/nfo/attachment.h src/nfo/attachment.h
+index 2e769ac..859eea3 100644
+--- src/nfo/attachment.h
++++ src/nfo/attachment.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/embeddedfiledataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file attached to another data object. Many data formats allow
+diff --git src/nfo/audio.h src/nfo/audio.h
+index df69743..d764699 100644
+--- src/nfo/audio.h
++++ src/nfo/audio.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/media.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file containing audio content
+diff --git src/nfo/bookmark.h src/nfo/bookmark.h
+index 048fe58..e4b2124 100644
+--- src/nfo/bookmark.h
++++ src/nfo/bookmark.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A bookmark of a webbrowser. Use nie:title for the name/label,
+diff --git src/nfo/bookmarkfolder.h src/nfo/bookmarkfolder.h
+index 6cacd8f..eb620a6 100644
+--- src/nfo/bookmarkfolder.h
++++ src/nfo/bookmarkfolder.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A folder with bookmarks of a webbrowser. Use nfo:containsBookmark
+diff --git src/nfo/compressiontype.h src/nfo/compressiontype.h
+index e90ae89..b6ed4a8 100644
+--- src/nfo/compressiontype.h
++++ src/nfo/compressiontype.h
+@@ -8,9 +8,9 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * Type of compression. Instances of this class represent the
+diff --git src/nfo/cursor.h src/nfo/cursor.h
+index 1f4a591..b614163 100644
+--- src/nfo/cursor.h
++++ src/nfo/cursor.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/rasterimage.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A Cursor.
+diff --git src/nfo/datacontainer.h src/nfo/datacontainer.h
+index dc01e8b..c3bb784 100644
+--- src/nfo/datacontainer.h
++++ src/nfo/datacontainer.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A superclass for all entities, whose primary purpose is to serve
+diff --git src/nfo/deletedresource.h src/nfo/deletedresource.h
+index a3120c7..8cddcce 100644
+--- src/nfo/deletedresource.h
++++ src/nfo/deletedresource.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/filedataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file entity that has been deleted from the original source.
+diff --git src/nfo/document.h src/nfo/document.h
+index d82350f..501567b 100644
+--- src/nfo/document.h
++++ src/nfo/document.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A generic document. A common superclass for all documents on
+diff --git src/nfo/embeddedfiledataobject.h src/nfo/embeddedfiledataobject.h
+index 0fb26e1..a04c565 100644
+--- src/nfo/embeddedfiledataobject.h
++++ src/nfo/embeddedfiledataobject.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/filedataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file embedded in another data object. There are many ways in
+diff --git src/nfo/encryptionstatus.h src/nfo/encryptionstatus.h
+index d73584c..d005fd0 100644
+--- src/nfo/encryptionstatus.h
++++ src/nfo/encryptionstatus.h
+@@ -8,9 +8,9 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * The status of the encryption of an InformationElement. nfo:encryptedStatus
+diff --git src/nfo/executable.h src/nfo/executable.h
+index cf95895..01d3ec8 100644
+--- src/nfo/executable.h
++++ src/nfo/executable.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An executable file.
+diff --git src/nfo/filedataobject.h src/nfo/filedataobject.h
+index 0d830af..5b1a814 100644
+--- src/nfo/filedataobject.h
++++ src/nfo/filedataobject.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A resource containing a finite sequence of bytes with arbitrary
+diff --git src/nfo/filehash.h src/nfo/filehash.h
+index fc0dc54..82ea67c 100644
+--- src/nfo/filehash.h
++++ src/nfo/filehash.h
+@@ -8,14 +8,14 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A fingerprint of the file, generated by some hashing function.
+ */
+-class FileHash : public virtual Nepomuk::SimpleResource
++class FileHash : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ FileHash(const QUrl& uri = QUrl())
+diff --git src/nfo/filesystem.h src/nfo/filesystem.h
+index 742d3f4..46f760c 100644
+--- src/nfo/filesystem.h
++++ src/nfo/filesystem.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/datacontainer.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A filesystem. Examples of filesystems include hard disk partitions,
+diff --git src/nfo/filesystemimage.h src/nfo/filesystemimage.h
+index 51669a2..0215a49 100644
+--- src/nfo/filesystemimage.h
++++ src/nfo/filesystemimage.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/filesystem.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An image of a filesystem. Instances of this class may include
+diff --git src/nfo/folder.h src/nfo/folder.h
+index ba19889..4faf07e 100644
+--- src/nfo/folder.h
++++ src/nfo/folder.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/datacontainer.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A folder/directory. Examples of folders include folders on
+diff --git src/nfo/font.h src/nfo/font.h
+index cede3fe..909d7da 100644
+--- src/nfo/font.h
++++ src/nfo/font.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A font.
+diff --git src/nfo/harddiskpartition.h src/nfo/harddiskpartition.h
+index b256dd5..27d1687 100644
+--- src/nfo/harddiskpartition.h
++++ src/nfo/harddiskpartition.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A partition on a hard disk
+diff --git src/nfo/htmldocument.h src/nfo/htmldocument.h
+index 27f767e..c37d958 100644
+--- src/nfo/htmldocument.h
++++ src/nfo/htmldocument.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/plaintextdocument.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A HTML document, may contain links to other files.
+diff --git src/nfo/icon.h src/nfo/icon.h
+index 07f96f3..b289d5c 100644
+--- src/nfo/icon.h
++++ src/nfo/icon.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/image.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An Icon (regardless of whether it's a raster or a vector icon.
+diff --git src/nfo/image.h src/nfo/image.h
+index 07a9725..9a5db11 100644
+--- src/nfo/image.h
++++ src/nfo/image.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/visual.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file containing an image.
+diff --git src/nfo/localfiledataobject.h src/nfo/localfiledataobject.h
+index 5234c51..3b366d6 100644
+--- src/nfo/localfiledataobject.h
++++ src/nfo/localfiledataobject.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/filedataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A local file data object which is stored on a local file system.
+diff --git src/nfo/media.h src/nfo/media.h
+index 6ccf17b..a0e5ec8 100644
+--- src/nfo/media.h
++++ src/nfo/media.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A piece of media content. This class may be used to express complex
+diff --git src/nfo/mediafilelistentry.h src/nfo/mediafilelistentry.h
+index 2f02c25..4afad67 100644
+--- src/nfo/mediafilelistentry.h
++++ src/nfo/mediafilelistentry.h
+@@ -8,9 +8,9 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A single node in the list of media files contained within an MediaList
+@@ -22,7 +22,7 @@ namespace NFO {
+ * points at another MediaFileListEntr. At the end of the list
+ * there is a link to rdf:nil.
+ */
+-class MediaFileListEntry : public virtual Nepomuk::SimpleResource
++class MediaFileListEntry : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ MediaFileListEntry(const QUrl& uri = QUrl())
+diff --git src/nfo/medialist.h src/nfo/medialist.h
+index 80e3066..80893bf 100644
+--- src/nfo/medialist.h
++++ src/nfo/medialist.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file containing a list of media files.e.g. a playlist
+diff --git src/nfo/mediastream.h src/nfo/mediastream.h
+index 70f489f..fb6472c 100644
+--- src/nfo/mediastream.h
++++ src/nfo/mediastream.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A stream of multimedia content, usually contained within a
+diff --git src/nfo/mindmap.h src/nfo/mindmap.h
+index 0a01250..bdc798a 100644
+--- src/nfo/mindmap.h
++++ src/nfo/mindmap.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/document.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A MindMap, created by a mind-mapping utility. Examples might
+diff --git src/nfo/operatingsystem.h src/nfo/operatingsystem.h
+index 97f6fcc..253a4b7 100644
+--- src/nfo/operatingsystem.h
++++ src/nfo/operatingsystem.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/software.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An OperatingSystem
+diff --git src/nfo/paginatedtextdocument.h src/nfo/paginatedtextdocument.h
+index 36ab901..f797f90 100644
+--- src/nfo/paginatedtextdocument.h
++++ src/nfo/paginatedtextdocument.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/textdocument.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file containing a text document, that is unambiguously divided
+diff --git src/nfo/plaintextdocument.h src/nfo/plaintextdocument.h
+index c5f18f6..ed27314 100644
+--- src/nfo/plaintextdocument.h
++++ src/nfo/plaintextdocument.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/textdocument.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file containing plain text (ASCII, Unicode or other encodings).
+diff --git src/nfo/presentation.h src/nfo/presentation.h
+index c6770fa..60189c5 100644
+--- src/nfo/presentation.h
++++ src/nfo/presentation.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/document.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A Presentation made by some presentation software (Corel Presentations,
+diff --git src/nfo/rasterimage.h src/nfo/rasterimage.h
+index bfad574..8184060 100644
+--- src/nfo/rasterimage.h
++++ src/nfo/rasterimage.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/image.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A raster image.
+diff --git src/nfo/remotedataobject.h src/nfo/remotedataobject.h
+index 4892136..48fb4c5 100644
+--- src/nfo/remotedataobject.h
++++ src/nfo/remotedataobject.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/filedataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A file data object stored at a remote location. Don't confuse
+diff --git src/nfo/remoteportaddress.h src/nfo/remoteportaddress.h
+index 59e2b61..1329dd5 100644
+--- src/nfo/remoteportaddress.h
++++ src/nfo/remoteportaddress.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An address specifying a remote host and port. Such an address
+diff --git src/nfo/software.h src/nfo/software.h
+index 07714e3..cd22c94 100644
+--- src/nfo/software.h
++++ src/nfo/software.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A piece of software. Examples may include applications and
+diff --git src/nfo/softwareitem.h src/nfo/softwareitem.h
+index 1934b64..9b54b3f 100644
+--- src/nfo/softwareitem.h
++++ src/nfo/softwareitem.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A DataObject representing a piece of software. Examples of
+diff --git src/nfo/softwareservice.h src/nfo/softwareservice.h
+index 247e20f..d88f9f6 100644
+--- src/nfo/softwareservice.h
++++ src/nfo/softwareservice.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A service published by a piece of software, either by an operating
+diff --git src/nfo/sourcecode.h src/nfo/sourcecode.h
+index fdeb425..19ca768 100644
+--- src/nfo/sourcecode.h
++++ src/nfo/sourcecode.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/plaintextdocument.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * Code in a compilable or interpreted programming language.
+diff --git src/nfo/spreadsheet.h src/nfo/spreadsheet.h
+index 45b65d7..4556262 100644
+--- src/nfo/spreadsheet.h
++++ src/nfo/spreadsheet.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/document.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A spreadsheet, created by a spreadsheet application. Examples
+diff --git src/nfo/textdocument.h src/nfo/textdocument.h
+index 3e88e3a..4e3f1af 100644
+--- src/nfo/textdocument.h
++++ src/nfo/textdocument.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/document.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A text document
+diff --git src/nfo/trash.h src/nfo/trash.h
+index 9dbc38b..4f5f880 100644
+--- src/nfo/trash.h
++++ src/nfo/trash.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/datacontainer.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * Represents a container for deleted files, a feature common
+diff --git src/nfo/vectorimage.h src/nfo/vectorimage.h
+index a9d25d7..a81b885 100644
+--- src/nfo/vectorimage.h
++++ src/nfo/vectorimage.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/image.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ *
+diff --git src/nfo/video.h src/nfo/video.h
+index 74905cb..10c2b54 100644
+--- src/nfo/video.h
++++ src/nfo/video.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/visual.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A video file.
+diff --git src/nfo/visual.h src/nfo/visual.h
+index aaf75aa..f612d3d 100644
+--- src/nfo/visual.h
++++ src/nfo/visual.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/media.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * File containing visual content.
+diff --git src/nfo/webdataobject.h src/nfo/webdataobject.h
+index 55aa121..a356f11 100644
+--- src/nfo/webdataobject.h
++++ src/nfo/webdataobject.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/dataobject.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * An information resources of which representations (files,
+diff --git src/nfo/website.h src/nfo/website.h
+index ae8d67b..7ee9adf 100644
+--- src/nfo/website.h
++++ src/nfo/website.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NFO {
+ /**
+ * A website, usually a container for remote resources, that may
+diff --git src/nie/dataobject.h src/nie/dataobject.h
+index 5de3cee..adc3f99 100644
+--- src/nie/dataobject.h
++++ src/nie/dataobject.h
+@@ -8,9 +8,9 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NIE {
+ /**
+ * A unit of data that is created, annotated and processed on the
+@@ -22,7 +22,7 @@ namespace NIE {
+ * is not intended to be instantiated by itself. Use more specific
+ * subclasses.
+ */
+-class DataObject : public virtual Nepomuk::SimpleResource
++class DataObject : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ DataObject(const QUrl& uri = QUrl())
+diff --git src/nie/datasource.h src/nie/datasource.h
+index 71b04e4..b6397fe 100644
+--- src/nie/datasource.h
++++ src/nie/datasource.h
+@@ -8,7 +8,7 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ namespace Nepomuk {
+ namespace NIE {
+@@ -25,7 +25,7 @@ namespace NIE {
+ * application to gain access to the data sources. (paths, urls,
+ * passwords etc...)
+ */
+-class DataSource : public virtual Nepomuk::SimpleResource
++class DataSource : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ DataSource(const QUrl& uri = QUrl())
+diff --git src/nie/informationelement.h src/nie/informationelement.h
+index 4d0ff89..89ac91a 100644
+--- src/nie/informationelement.h
++++ src/nie/informationelement.h
+@@ -8,15 +8,15 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NIE {
+ /**
+ * A unit of content the user works with. This is a superclass for
+ * all interpretations of a DataObject.
+ */
+-class InformationElement : public virtual Nepomuk::SimpleResource
++class InformationElement : public virtual Nepomuk2::SimpleResource
+ {
+ public:
+ InformationElement(const QUrl& uri = QUrl())
+diff --git src/nmm/movie.h src/nmm/movie.h
+index e80601a..2041f0c 100644
+--- src/nmm/movie.h
++++ src/nmm/movie.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/video.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NMM {
+ /**
+ * A Movie
+diff --git src/nmm/musicalbum.h src/nmm/musicalbum.h
+index 529a255..4115cfa 100644
+--- src/nmm/musicalbum.h
++++ src/nmm/musicalbum.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/medialist.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NMM {
+ /**
+ * The music album as provided by the publisher. Not to be confused
+diff --git src/nmm/musicpiece.h src/nmm/musicpiece.h
+index 6a99872..6ddfa20 100644
+--- src/nmm/musicpiece.h
++++ src/nmm/musicpiece.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/audio.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NMM {
+ /**
+ * Used to assign music-specific properties such a BPM to video
+diff --git src/nmm/tvseries.h src/nmm/tvseries.h
+index 7ba98a0..5155a7f 100644
+--- src/nmm/tvseries.h
++++ src/nmm/tvseries.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nie/informationelement.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NMM {
+ /**
+ * A TV Series has multiple seasons and episodes
+diff --git src/nmm/tvshow.h src/nmm/tvshow.h
+index f89335f..4086eac 100644
+--- src/nmm/tvshow.h
++++ src/nmm/tvshow.h
+@@ -8,11 +8,11 @@
+ #include <QtCore/QTime>
+ #include <QtCore/QDateTime>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ #include "nfo/video.h"
+
+-namespace Nepomuk {
++namespace Nepomuk2 {
+ namespace NMM {
+ /**
+ * A TV Show
+diff --git src/tvnamer.cpp src/tvnamer.cpp
+index 5f58e1e..03067ae 100644
+--- src/tvnamer.cpp
++++ src/tvnamer.cpp
+@@ -49,11 +49,11 @@
+ #include <KConfigGroup>
+ #include <KMimeType>
+
+-#include <Nepomuk/Vocabulary/NMM>
+-#include <nepomuk/simpleresource.h>
+-#include <nepomuk/simpleresourcegraph.h>
+-#include <nepomuk/datamanagement.h>
+-#include <nepomuk/storeresourcesjob.h>
++#include <Nepomuk2/Vocabulary/NMM>
++#include <nepomuk2/simpleresource.h>
++#include <nepomuk2/simpleresourcegraph.h>
++#include <nepomuk2/datamanagement.h>
++#include <nepomuk2/storeresourcesjob.h>
+
+ #include <Soprano/Vocabulary/RDFS>
+ #include <Soprano/Vocabulary/NAO>
+@@ -204,9 +204,9 @@ void TVNamer::decideFinalSeries()
+ lookupSeries();
+ }
+
+-Nepomuk::SimpleResource TVNamer::createNepomukResource(const KUrl& url, int season, int episode, const Tvdb::Series &series)
++Nepomuk2::SimpleResource TVNamer::createNepomukResource(const KUrl& url, int season, int episode, const Tvdb::Series &series)
+ {
+- Nepomuk::NMM::TVShow episodeRes(url);
++ Nepomuk2::NMM::TVShow episodeRes(url);
+ episodeRes.setEpisodeNumber(episode);
+ episodeRes.setSeason(season);
+ episodeRes.setTitle(series[season][episode].name());
+@@ -282,15 +282,15 @@ void TVNamer::saveToNepomuk()
+ return;
+ }
+
+- Nepomuk::SimpleResourceGraph graph;
++ Nepomuk2::SimpleResourceGraph graph;
+
+ // get all the series information
+- Nepomuk::NMM::TVSeries seriesRes;
++ Nepomuk2::NMM::TVSeries seriesRes;
+ seriesRes.setTitle(series.name());
+ seriesRes.addDescription(series.overview());
+ if(!series.imdbId().isEmpty()) {
+ // TODO: this is not nice: the DMS does not allow to simply use an http URL as object
+- Nepomuk::NFO::WebDataObject imdbRes(series.imdbUrl());
++ Nepomuk2::NFO::WebDataObject imdbRes(series.imdbUrl());
+ seriesRes.addProperty(RDFS::seeAlso(), imdbRes.uri());
+ graph << imdbRes;
+ }
+@@ -302,15 +302,15 @@ void TVNamer::saveToNepomuk()
+ continue;
+ }
+ }
+- Nepomuk::NFO::Image banner(localUrl);
++ Nepomuk2::NFO::Image banner(localUrl);
+ seriesRes.addDepiction(banner.uri());
+ graph << banner;
+ }
+
+ // create all the regular actor resources which we will add to all episodes
+- QList<Nepomuk::NCO::Contact> regularActors;
++ QList<Nepomuk2::NCO::Contact> regularActors;
+ foreach(const QString& actor, series.actors()) {
+- Nepomuk::NCO::Contact contact;
++ Nepomuk2::NCO::Contact contact;
+ contact.setFullname(actor);
+ regularActors << contact;
+ graph << contact;
+@@ -322,29 +322,29 @@ void TVNamer::saveToNepomuk()
+ const Tvdb::Episode episode = series[it.value().season][it.value().episode];
+
+ // create the basic episode
+- Nepomuk::NMM::TVShow episodeRes = createNepomukResource(QUrl::fromLocalFile(it.key()), it.value().season, it.value().episode, series);
++ Nepomuk2::NMM::TVShow episodeRes = createNepomukResource(QUrl::fromLocalFile(it.key()), it.value().season, it.value().episode, series);
+
+ // add all the actors
+- foreach(const Nepomuk::NCO::Contact& actor, regularActors) {
++ foreach(const Nepomuk2::NCO::Contact& actor, regularActors) {
+ episodeRes.addActor(actor.uri());
+ episodeRes.addProperty(NAO::hasSubResource(), actor.uri());
+ }
+ // add the guest stars
+ foreach(const QString& guestStar, episode.guestStars()) {
+- Nepomuk::NCO::Contact contact;
++ Nepomuk2::NCO::Contact contact;
+ contact.setFullname(guestStar);
+ episodeRes.addActor(contact.uri());
+ episodeRes.addProperty(NAO::hasSubResource(), contact.uri());
+ graph << contact;
+ }
+ if(!episode.director().isEmpty()) {
+- Nepomuk::NCO::Contact contact;
++ Nepomuk2::NCO::Contact contact;
+ contact.setFullname(episode.director());
+ graph << contact;
+ episodeRes.addDirector(contact.uri());
+ }
+ foreach(const QString& writer, episode.writers()) {
+- Nepomuk::NCO::Contact contact;
++ Nepomuk2::NCO::Contact contact;
+ contact.setFullname(writer);
+ graph << contact;
+ episodeRes.addWriter(contact.uri());
+@@ -358,7 +358,7 @@ void TVNamer::saveToNepomuk()
+ // add the series to the graph (after the episodes)
+ graph << seriesRes;
+
+- connect(Nepomuk::storeResources(graph, Nepomuk::IdentifyNew, Nepomuk::OverwriteProperties), SIGNAL(result(KJob*)),
++ connect(Nepomuk2::storeResources(graph, Nepomuk2::IdentifyNew, Nepomuk2::OverwriteProperties), SIGNAL(result(KJob*)),
+ this, SLOT(slotSaveToNepomukDone(KJob*)));
+ }
+ else {
+diff --git src/tvnamer.h src/tvnamer.h
+index a40125c..b9111b5 100644
+--- src/tvnamer.h
++++ src/tvnamer.h
+@@ -31,7 +31,7 @@
+
+ #include <tvdb/series.h>
+
+-#include <nepomuk/simpleresource.h>
++#include <nepomuk2/simpleresource.h>
+
+ class KJob;
+ namespace Tvdb {
+@@ -65,7 +65,7 @@ private:
+ */
+ bool checkSeries(const Tvdb::Series& series) const;
+
+- Nepomuk::SimpleResource createNepomukResource(const KUrl& url, int season, int episode, const Tvdb::Series& series);
++ Nepomuk2::SimpleResource createNepomukResource(const KUrl& url, int season, int episode, const Tvdb::Series& series);
+
+ /**
+ * Adds the banner folder to the indexer config.
diff --git a/nepomuktvnamer.spec b/nepomuktvnamer.spec
new file mode 100644
index 0000000..6aaeb20
--- /dev/null
+++ b/nepomuktvnamer.spec
@@ -0,0 +1,61 @@
+Name: nepomuktvnamer
+Version: 0.2.0
+Release: 3%{?dist}
+Summary: Nepomuk TV shows manager
+License: LGPLv2+
+URL: http://trueg.wordpress.com/2012/02/11/a-fun-release-nepomuk-tv-namer-0-2/
+Source0: http://download.kde.org/unstable/nepomuk/%{name}-%{version}.tar.bz2
+Patch0: nepomuktvnamer-nepomuk2-port.patch
+
+BuildRequires: cmake
+BuildRequires: libtvdb-devel
+BuildRequires: kdelibs-devel
+BuildRequires: soprano-devel
+BuildRequires: nepomuk-core-devel
+Requires: shared-desktop-ontologies
+
+%description
+A Nepomuk-based TV show manager. You can run it from context menu
+in Dolphin or Konqueror. It will automatically look up all information
+about all TV series in the folder on thetvdb.com and store them in
+Nepomuk.
+
+
+%prep
+%setup -q
+%patch0
+
+
+%build
+%{cmake_kde4} .
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot}
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING COPYING.LIB
+%{_bindir}/nepomuktvnamer
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_datadir}/*
+
+
+%changelog
+* Sat Dec 22 2012 Dan Vrátil <dvratli at redhat.com> - 0.2.0-3
+- Remove BuildRoot tag
+- Add nepomuk-core-devel to BR
+
+* Tue Oct 23 2012 Dan Vrátil <dvratil at redhat.com> - 0.2.0-2
+- Use KDE macros
+- Renamed patch
+- Added AUTHORS, COPYING and COPYING.LIB to documentation
+
+* Sun Oct 21 2012 Dan Vrátil <dvratil at redhat.com> - 0.2.0-1
+- Initial package
diff --git a/sources b/sources
index e69de29..2c4b4ad 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+2c7da76d2dcc3a16e0f553e3a4d4d34b nepomuktvnamer-0.2.0.tar.bz2
More information about the scm-commits
mailing list