diff -Nru kactivities-4.13.0/debian/changelog kactivities-4.13.3/debian/changelog --- kactivities-4.13.0/debian/changelog 2014-04-10 20:37:36.000000000 +0000 +++ kactivities-4.13.3/debian/changelog 2014-11-21 14:22:19.000000000 +0000 @@ -1,3 +1,21 @@ +kactivities (4:4.13.3-0ubuntu0.2) trusty-security; urgency=medium + + * No change rebuild for the -security pocket + + -- Marc Deslauriers Fri, 21 Nov 2014 09:22:07 -0500 + +kactivities (4:4.13.3-0ubuntu0.1) trusty; urgency=medium + + * New upstream bugfix release (LP: #1349296) + + -- Philip Muškovac Mon, 28 Jul 2014 10:40:26 +0200 + +kactivities (4:4.13.2-0ubuntu0.1) trusty; urgency=medium + + * New upstream bugfix release (LP: #1327591) + + -- Philip Muškovac Wed, 18 Jun 2014 12:45:55 +0200 + kactivities (4:4.13.0-0ubuntu1) trusty; urgency=medium * New upstream KDE Software Compilation release diff -Nru kactivities-4.13.0/debian/control kactivities-4.13.3/debian/control --- kactivities-4.13.0/debian/control 2014-04-10 20:37:36.000000000 +0000 +++ kactivities-4.13.3/debian/control 2014-07-28 08:40:25.000000000 +0000 @@ -9,7 +9,7 @@ Sune Vuorela Build-Depends: kde-sc-dev-latest (>= 4:4.10.1), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.15.4~), - kdelibs5-dev (>= 4:4.13.0), nepomuk-core-dev (>= 4:4.13.0), + kdelibs5-dev (>= 4:4.13.3), nepomuk-core-dev (>= 4:4.13.3), libsoprano-dev, shared-desktop-ontologies (>= 0.8.1), libx11-dev, diff -Nru kactivities-4.13.0/src/CMakeLists.txt kactivities-4.13.3/src/CMakeLists.txt --- kactivities-4.13.0/src/CMakeLists.txt 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/CMakeLists.txt 2014-06-29 07:30:23.000000000 +0000 @@ -53,45 +53,49 @@ # main part -string (COMPARE EQUAL "${CXX_FEATURES_UNSUPPORTED}" "" CXX_COMPILER_IS_MODERN) +option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the service and other modules." OFF) -if (NOT HAVE_CXX11_AUTO OR NOT HAVE_CXX11_LAMBDA OR NOT HAVE_CXX11_UNIQUE_PTR OR NOT HAVE_CXX11_VARIADIC_TEMPLATES OR NOT HAVE_CXX11_INITIALIZER_LISTS) +if (NOT KACTIVITIES_LIBRARY_ONLY) + string (COMPARE EQUAL "${CXX_FEATURES_UNSUPPORTED}" "" CXX_COMPILER_IS_MODERN) - macro_log_feature (FALSE - "C++11 enabled compiler" - "GCC >=4.5 or Clang 3.1" - "http://www.open-std.org/jtc1/sc22/wg21/" FALSE "" - "REQUIRED: You need a more modern compiler in order to build the Activity Manager daemon" - ) - -else () - - if (CXX_COMPILER_IS_MODERN) - macro_log_feature ( - CXX_COMPILER_IS_MODERN - "C++11 enabled compiler" - "Your compiler is state-of-the-art" - "http://www.open-std.org/jtc1/sc22/wg21/" FALSE "" - "Your compiler doesn't support the following features: ${CXX_FEATURES_UNSUPPORTED} but - the list of the supported ones is sufficient for the build: ${CXX_FEATURES_SUPPORTED}" - ) - else () - macro_log_feature ( - CXX_COMPILER_IS_MODERN - "C++11 enabled compiler" - "Having to use the latest versions of GCC and Clang would be awesome" - "http://www.open-std.org/jtc1/sc22/wg21/" FALSE "" - "Your compiler doesn't support the following features: ${CXX_FEATURES_UNSUPPORTED} but - the list of the supported ones is sufficient for the build: ${CXX_FEATURES_SUPPORTED}" - ) - endif () + if (NOT HAVE_CXX11_AUTO OR NOT HAVE_CXX11_LAMBDA OR NOT HAVE_CXX11_UNIQUE_PTR OR NOT HAVE_CXX11_VARIADIC_TEMPLATES OR NOT HAVE_CXX11_INITIALIZER_LISTS) - add_subdirectory (service) + macro_log_feature (FALSE + "C++11 enabled compiler" + "GCC >=4.5 or Clang 3.1" + "http://www.open-std.org/jtc1/sc22/wg21/" FALSE "" + "REQUIRED: You need a more modern compiler in order to build the Activity Manager daemon" + ) + + else () + + if (CXX_COMPILER_IS_MODERN) + macro_log_feature ( + CXX_COMPILER_IS_MODERN + "C++11 enabled compiler" + "Your compiler is state-of-the-art" + "http://www.open-std.org/jtc1/sc22/wg21/" FALSE "" + "Your compiler doesn't support the following features: ${CXX_FEATURES_UNSUPPORTED} but + the list of the supported ones is sufficient for the build: ${CXX_FEATURES_SUPPORTED}" + ) + else () + macro_log_feature ( + CXX_COMPILER_IS_MODERN + "C++11 enabled compiler" + "Having to use the latest versions of GCC and Clang would be awesome" + "http://www.open-std.org/jtc1/sc22/wg21/" FALSE "" + "Your compiler doesn't support the following features: ${CXX_FEATURES_UNSUPPORTED} but + the list of the supported ones is sufficient for the build: ${CXX_FEATURES_SUPPORTED}" + ) + endif () - # No point in having workspace addons without the service - add_subdirectory (workspace) + add_subdirectory (service) -endif () + # No point in having workspace addons without the service + add_subdirectory (workspace) + + endif () +endif() add_subdirectory (ontologies) diff -Nru kactivities-4.13.0/src/lib/core/utils_p.h kactivities-4.13.3/src/lib/core/utils_p.h --- kactivities-4.13.0/src/lib/core/utils_p.h 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/lib/core/utils_p.h 2014-06-29 07:30:23.000000000 +0000 @@ -30,7 +30,6 @@ // Creates an async call to retrieve a value from the dbus service // and initializes the call watcher #define KAMD_RETRIEVE_REMOTE_VALUE(Variable, MethodToCall, Target) \ - qDebug() << "Locking mutex for" << #Variable; \ Variable##Mutex.lock(); \ const QDBusPendingCall & Variable##Call = Manager::activities()->MethodToCall; \ Variable##CallWatcher = new QDBusPendingCallWatcher(Variable##Call, Target); \ @@ -80,7 +79,6 @@ Variable##CallWatcher = 0; \ Variable##Mutex.unlock(); \ call->deleteLater(); \ - qDebug() << "Unlocked mutex"; \ } // Implements a value getter @@ -89,7 +87,6 @@ { \ if (!Manager::isServicePresent()) return Default; \ waitForCallFinished(d->Variable##CallWatcher, &d->Variable##Mutex); \ - qDebug() << "Returning" << #Variable << d->Variable; \ return d->Variable; \ } @@ -98,7 +95,6 @@ if (watcher) { watcher->waitForFinished(); - qDebug() << "Trying to lock mutex"; mutex->lock(); mutex->unlock(); } diff -Nru kactivities-4.13.0/src/service/files/activitymanager-plugin.desktop kactivities-4.13.3/src/service/files/activitymanager-plugin.desktop --- kactivities-4.13.0/src/service/files/activitymanager-plugin.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/files/activitymanager-plugin.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -10,6 +10,7 @@ Comment[da]=Aktivitetshåndtering-plugin Comment[de]=Modul für Aktivitätenverwaltung Comment[el]=Πρόσθετο διαχειριστή δραστηριοτήτων +Comment[en_GB]=Activity manager plugin Comment[es]=Complemento del gestor de actividades Comment[et]=Tegevuste haldamise plugin Comment[eu]=Jarduera kudeatzailearen plugina diff -Nru kactivities-4.13.0/src/service/files/kactivitymanagerd.desktop kactivities-4.13.3/src/service/files/kactivitymanagerd.desktop --- kactivities-4.13.0/src/service/files/kactivitymanagerd.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/files/kactivitymanagerd.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -14,6 +14,7 @@ Name[da]=Aktivitetshåndtering Name[de]=Aktivitätenverwaltung Name[el]=Διαχειριστής δραστηριοτήτων +Name[en_GB]=Activity Manager Name[es]=Gestor de actividades Name[et]=Tegevuste haldur Name[eu]=Jarduera kudeatzailea @@ -64,6 +65,7 @@ Comment[da]=Motor til aktivitetshåndtering Comment[de]=Backend der Aktivitätenverwaltung Comment[el]=Το σύστημα υποστήριξης διαχείρισης δραστηριοτήτων +Comment[en_GB]=The activity management backend Comment[es]=El motor de la gestión de actividades Comment[et]=Tegevuste haldamise taustaprogramm Comment[eu]=Jarduera kudeaketa 'backend' diff -Nru kactivities-4.13.0/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop kactivities-4.13.3/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop --- kactivities-4.13.0/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/plugins/activityranking/activitymanager-plugin-activityranking.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -7,6 +7,7 @@ Name[da]=Aktivitetsrangering Name[de]=Aktivitätenbewertung Name[el]=Αξιολόγηση δραστηριοτήτων +Name[en_GB]=Activity ranking Name[es]=Puntuación de las actividades Name[et]=Tegevuste hindamine Name[eu]=Jardueren sailkapena @@ -53,6 +54,7 @@ Comment[da]=Plugin til at rangere aktiviteter baseret på brug Comment[de]=Modul, das Aktivitäten anhand der Benutzung bewertet Comment[el]=Πρόσθετο για την αξιολόγηση δραστηριοτήτων με βάση τη χρήση +Comment[en_GB]=Plugin to rank activities based on usage Comment[es]=Complemento para puntuar actividades basándose en su uso Comment[et]=Plugin tegevuste hindamiseks kasutuse põhjal Comment[eu]=Jarduerak erabileraren arabera sailkatzeko plugina @@ -102,5 +104,5 @@ X-KDE-PluginInfo-Category= X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=GPL -X-KDE-PluginInfo-EnabledByDefault=true +X-KDE-PluginInfo-EnabledByDefault=false diff -Nru kactivities-4.13.0/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop kactivities-4.13.3/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop --- kactivities-4.13.0/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/plugins/globalshortcuts/activitymanager-plugin-globalshortcuts.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -7,6 +7,7 @@ Name[da]=Globale genveje Name[de]=Globale Kurzbefehle Name[el]=Καθολικές συντομεύσεις +Name[en_GB]=Global Shortcuts Name[es]=Accesos rápidos de teclado globales Name[et]=Globaalsed kiirklahvid Name[eu]=Lasterbide orokorrak @@ -54,6 +55,7 @@ Comment[da]=Tilføjer globale tastaturgenveje til skift af aktivitet Comment[de]=Fügt globale Tastatur-Kurzbefehle für das Wechseln von Aktivitäten hinzu Comment[el]=Προσθέτει καθολικές συντομεύσεις πληκτρολογίου για εναλλαγή δραστηριοτήτων +Comment[en_GB]=Adds global keyboard shortcuts for activity switching Comment[es]=Añade accesos rápidos de teclado globales para el cambio de actividad Comment[et]=Globaalsete kiirklahvide lisamine tegevuste vahetamiseks Comment[eu]=Teklatuaren lasterbide orokorrak eransten ditu jardueren artean aldatzeko diff -Nru kactivities-4.13.0/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop kactivities-4.13.3/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop --- kactivities-4.13.0/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -6,6 +6,7 @@ Name[da]=Nepomuk-feeder Name[de]=Nepomuk Feeder Name[el]=Τροφοδότης του Nepomuk +Name[en_GB]=Nepomuk Feeder Name[es]=Aprovisionamiento de Nepomuk Name[et]=Nepomuki söötur Name[fi]=Nepomuk-syötteistin @@ -50,6 +51,7 @@ Comment[da]=Plugin til at synkronisere data med Nepomuk Comment[de]=Modul zum Abgleichen von Daten in Nepomuk Comment[el]=Πρόσθετο συγχρονισμού γεγονότων με το Nepomuk +Comment[en_GB]=Plugin to synchronize data with Nepomuk Comment[es]=Complemento para sincronizar datos con Nepomuk Comment[et]=Plugin andmete sünkroonimiseks Nepomukiga Comment[fi]=Liitännäinen tietojen synkronointiin Nepomukin kanssa diff -Nru kactivities-4.13.0/src/service/plugins/slc/activitymanager-plugin-slc.desktop kactivities-4.13.3/src/service/plugins/slc/activitymanager-plugin-slc.desktop --- kactivities-4.13.0/src/service/plugins/slc/activitymanager-plugin-slc.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/plugins/slc/activitymanager-plugin-slc.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -6,6 +6,7 @@ Name[da]=Share-Like-Connect Name[de]=Share-Like-Connect Name[el]=Share-Like-Connect +Name[en_GB]=Share-Like-Connect Name[es]=Compartir-Me gusta-Conectar Name[et]=Share-Like-Connect Name[eu]=Share-Like-Connect @@ -50,6 +51,7 @@ Comment[da]=Giver data til Share-Like-Connect-appletten Comment[de]=Liefert Daten für das Miniprogramm Share-Like-Connect Comment[el]=Παρέχει δεδομένα σε μικροεφαρμογή Share-Like-Connect +Comment[en_GB]=Provides data to Share-Like-Connect applet Comment[es]=Proporciona datos a la miniaplicación Compartir-Me gusta-Conectar Comment[et]=Andmete edastamine Share-Like-Connecti pluginale Comment[eu]=Share-Like-Connect appletari datuak hornitzen dizkio diff -Nru kactivities-4.13.0/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop kactivities-4.13.3/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop --- kactivities-4.13.0/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/plugins/sqlite/activitymanager-plugin-sqlite.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -6,6 +6,7 @@ Name[da]=Sqlite-feeder Name[de]=Sqlite-Modul Name[el]=Τροφοδότης Sqlite +Name[en_GB]=Sqlite Feeder Name[es]=Aprovisionamiento de Sqlite Name[et]=Sqlite'i söötur Name[eu]=Sqlite elikatzailea @@ -52,6 +53,7 @@ Comment[da]=Plugin til at gemme og bedømme begivenheder i Sqlite Comment[de]=Modul zum Speichern und Bewerten von Ereignissen in SQLite Comment[el]=Πρόσθετο παροχής και υπολογισμού γεγονότων στο Sqlite +Comment[en_GB]=Plugin to store and score events in Sqlite Comment[es]=Complemento para almacenar y puntuar eventos en Sqlite Comment[et]=Plugin sündmuste salvestamiseks Sqlite'i ja nende hindamiseks Comment[eu]=Sqlite-n gertaerak biltegiratu eta puntuatzeko plugina diff -Nru kactivities-4.13.0/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop kactivities-4.13.3/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop --- kactivities-4.13.0/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/service/plugins/virtualdesktopswitch/activitymanager-plugin-virtualdesktopswitch.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -7,6 +7,7 @@ Name[da]=Skift mellem virtuelle skriveborde Name[de]=Virtueller Arbeitsflächenumschalter Name[el]=Εναλλάκτης εικονικής επιφάνειας εργασίας +Name[en_GB]=Virtual desktop switcher Name[es]=Selector de escritorio virtual Name[et]=Virtuaalsete töölaudade vahetaja Name[eu]=Alegiazko mahaigain aldatzailea @@ -52,6 +53,7 @@ Comment[da]=Når der skiftes til en aktivitet, åbnes det virtuelle skrivebord der senest blev brugt med den aktivitet Comment[de]=Beim Wechseln zu einer Aktivität wird die virtuelle Arbeitsfläche geöffnet, auf der zuletzt diese Aktivität benutzt wurde Comment[el]=Όταν γίνεται εναλλαγή δραστηριότητας, ανοίγει την εικονική επιφάνεια εργασίας που χρησιμοποιήθηκε τελευταία με τη δραστηριότητα αυτή +Comment[en_GB]=When switching to an activity, opens the virtual desktop last used with that activity Comment[es]=Cuando se cambia a una actividad, abre el escritorio virtual usado por última vez con dicha actividad Comment[et]=Avab tegevuse vahetamisel uues tegevuses viimati kasutatud virtuaalse töölaua Comment[eu]=Jarduera batera aldatzean, jarduera horrekin erabilitako azken alegiazko mahaigaina irekitzen du diff -Nru kactivities-4.13.0/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop kactivities-4.13.3/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop --- kactivities-4.13.0/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/workspace/fileitemplugin/kactivitymanagerd_fileitem_linking_plugin.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -8,6 +8,7 @@ Name[da]=Fil til plugin til aktivitetslinking Name[de]=Modul für die Verknüpfung von Dateien zu Aktivitäten Name[el]=Αρχείο σε πρόσθετο σύνδεσης δραστηριοτήτων +Name[en_GB]=File to activity linking plugin Name[es]=Complemento de enlace de archivo a actividad Name[et]=Faili tegevusega linkimise plugin Name[eu]=Fitxategia jarduerarekin lotzeko plugina diff -Nru kactivities-4.13.0/src/workspace/settings/kcm_activities.desktop kactivities-4.13.3/src/workspace/settings/kcm_activities.desktop --- kactivities-4.13.0/src/workspace/settings/kcm_activities.desktop 2014-04-04 17:38:42.000000000 +0000 +++ kactivities-4.13.3/src/workspace/settings/kcm_activities.desktop 2014-06-29 07:30:23.000000000 +0000 @@ -18,6 +18,7 @@ Name[da]=Aktiviteter Name[de]=Aktivitäten Name[el]=Δραστηριότητες +Name[en_GB]=Activities Name[es]=Actividades Name[et]=Tegevused Name[fi]=Aktiviteetit @@ -65,6 +66,7 @@ Comment[da]=Indstil aktivitetssystemet Comment[de]=Einrichtung des Aktivitätensystems Comment[el]=Διαμόρφωση του συστήματος δραστηριοτήτων +Comment[en_GB]=Configure the activities system Comment[es]=Configurar el sistema de actividades Comment[et]=Tegevuste süsteemi seadistamine Comment[fi]=Aktiviteettien asetukset