[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:12:15 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=2b95dd8
The following commit has been merged in the master branch:
commit 2b95dd8f2bfd9b190b6e68854b505039430f651b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Thu Dec 22 18:37:18 2011 +0100
Rename contact applet according to the new policy
Reviewed-by: Dario Freddi
REVIEW: 103506
CCMAIL: kde-i18n-doc at kde.org
---
CMakeLists.txt | 24 +++++++--------
Messages.sh | 2 +-
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 +++++++++++++
cmake/modules/FindKTelepathy.cmake | 36 ----------------------
cmake/modules/FindKTp.cmake | 36 ++++++++++++++++++++++
...et.desktop => plasma_applet_ktp_contact.desktop | 5 ++-
src/abstract-contact-delegate.cpp | 8 ++---
src/config.cpp | 8 ++---
src/contact-delegate.cpp | 10 +++---
9 files changed, 86 insertions(+), 65 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd5583c..a3280f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(plasma_applet_telepathy_contact)
+project(ktp-contact-applet)
cmake_minimum_required(VERSION 2.8)
@@ -9,11 +9,11 @@ set(CMAKE_MODULE_PATH
set(KDE_MIN_VERSION "4.6.0")
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
#find_package(KDE4Workspace REQUIRED)
find_package(TelepathyQt4 0.8.9 REQUIRED)
-find_package(KTelepathy REQUIRED)
+find_package(KTp REQUIRED)
include(KDE4Defaults)
@@ -25,11 +25,11 @@ include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
-set(telepathy_contact_applet_SRCS
+set(plasma_applet_ktp_contact_SRCS
src/abstract-contact-delegate.cpp
src/config.cpp
src/contact-delegate.cpp
@@ -37,19 +37,19 @@ set(telepathy_contact_applet_SRCS
src/telepathy-contact.cpp
)
-kde4_add_ui_files(telepathy_contact_applet_SRCS
+kde4_add_ui_files(plasma_applet_ktp_contact_SRCS
src/config.ui
)
-kde4_add_plugin(plasma_applet_telepathy_contact ${telepathy_contact_applet_SRCS})
-target_link_libraries(plasma_applet_telepathy_contact
+kde4_add_plugin(plasma_applet_ktp_contact ${plasma_applet_ktp_contact_SRCS})
+target_link_libraries(plasma_applet_ktp_contact
${KDE4_PLASMA_LIBS}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
- ${KTELEPATHY_MODELS_LIBRARIES}
+ ${KTP_LIBRARIES}
+ ${KTP_MODELS_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY})
install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact)
-install(TARGETS plasma_applet_telepathy_contact DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES telepathy-contact-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS plasma_applet_ktp_contact DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES plasma_applet_ktp_contact.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/Messages.sh b/Messages.sh
index 7e460f5..25ccb75 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,2 +1,2 @@
#! /usr/bin/env bash
-$XGETTEXT `find . -name "*.cpp"` -o $podir/plasma_applet_telepathy_contact.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/plasma_applet_ktp_contact.pot
diff --git a/cmake/modules/COPYING-CMAKE-SCRIPTS b/cmake/modules/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 0000000..4b41776
--- /dev/null
+++ b/cmake/modules/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
deleted file mode 100644
index c9aa9dc..0000000
--- a/cmake/modules/FindKTelepathy.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# Try to find the KTelepathy library
-# KTELEPATHY_FOUND
-# KTELEPATHY_INCLUDE_DIR
-# KTELEPATHY_LIBRARIES
-# KTELEPATHY_MODELS_LIBRARIES
-
-# Copyright (c) 2011, Dario Freddi <drf at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
- message (FATAL_ERROR "KTelepathy can be used just from internal components at this time")
-endif (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
-
-SET (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
-if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
- # Already in cache, be silent
- set(KTELEPATHY_FIND_QUIETLY TRUE)
-endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
-
-find_path(KTELEPATHY_INCLUDE_DIR
- NAMES KTelepathy/presence.h
- PATHS ${KDE4_INCLUDE_DIR}
-)
-
-find_library(KTELEPATHY_LIBRARIES NAMES telepathykdecommoninternalsprivate )
-find_library(KTELEPATHY_MODELS_LIBRARIES NAMES telepathykdemodelsprivate )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTelepathy DEFAULT_MSG
- KTELEPATHY_LIBRARIES
- KTELEPATHY_MODELS_LIBRARIES
- KTELEPATHY_INCLUDE_DIR)
-
-mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
diff --git a/cmake/modules/FindKTp.cmake b/cmake/modules/FindKTp.cmake
new file mode 100644
index 0000000..899a120
--- /dev/null
+++ b/cmake/modules/FindKTp.cmake
@@ -0,0 +1,36 @@
+# Try to find the KTp library
+# KTP_FOUND
+# KTP_INCLUDE_DIR
+# KTP_LIBRARIES
+# KTP_MODELS_LIBRARIES
+
+# Copyright (c) 2011, Dario Freddi <drf at kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT IS_KTP_INTERNAL_MODULE)
+ message (FATAL_ERROR "KTp can be used just from internal components at this time")
+endif (NOT IS_KTP_INTERNAL_MODULE)
+
+SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
+if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
+ # Already in cache, be silent
+ set(KTP_FIND_QUIETLY TRUE)
+endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
+
+find_path(KTP_INCLUDE_DIR
+ NAMES KTp/presence.h
+ PATHS ${KDE4_INCLUDE_DIR}
+)
+
+find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
+find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
+ KTP_LIBRARIES
+ KTP_MODELS_LIBRARIES
+ KTP_INCLUDE_DIR)
+
+mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)
diff --git a/telepathy-contact-applet.desktop b/plasma_applet_ktp_contact.desktop
similarity index 92%
rename from telepathy-contact-applet.desktop
rename to plasma_applet_ktp_contact.desktop
index 3220813..cc92ca4 100644
--- a/telepathy-contact-applet.desktop
+++ b/plasma_applet_ktp_contact.desktop
@@ -21,14 +21,13 @@ Icon=im-user
X-Plasma-DefaultSize=128,128
-X-KDE-Library=plasma_applet_telepathy_contact
-X-KDE-PluginInfo-Name=telepathy_contact
+X-KDE-Library=plasma_applet_ktp_contact
+X-KDE-PluginInfo-Name=ktp_contact
X-KDE-PluginInfo-Category=Online Services
X-KDE-PluginInfo-Author=Francesco Nwokeka
X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
X-KDE-PluginInfo-Version=0.2.60
X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
-X-KDE-PluginInfo-Depends=
X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=true
X-Plasma-DropMimeTypes=application/vnd.telepathy.contact
diff --git a/src/abstract-contact-delegate.cpp b/src/abstract-contact-delegate.cpp
index d88c29a..4410329 100644
--- a/src/abstract-contact-delegate.cpp
+++ b/src/abstract-contact-delegate.cpp
@@ -32,10 +32,10 @@
#include <KDE/KIconLoader>
#include <KDE/KIcon>
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/accounts-model-item.h>
-#include <KTelepathy/Models/groups-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/accounts-model-item.h>
+#include <KTp/Models/groups-model.h>
+#include <KTp/Models/contact-model-item.h>
const int SPACING = 2;
const int ACCOUNT_ICON_SIZE = 13;
diff --git a/src/config.cpp b/src/config.cpp
index 92f1844..b1827a7 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -20,10 +20,10 @@
#include "config.h"
#include "contact-delegate.h"
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
-#include <KTelepathy/Models/groups-model.h>
-#include <KTelepathy/Models/accounts-filter-model.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contact-model-item.h>
+#include <KTp/Models/groups-model.h>
+#include <KTp/Models/accounts-filter-model.h>
#include <KDebug>
#include <KPushButton>
diff --git a/src/contact-delegate.cpp b/src/contact-delegate.cpp
index 52d6f5a..90b443a 100644
--- a/src/contact-delegate.cpp
+++ b/src/contact-delegate.cpp
@@ -33,11 +33,11 @@
#include <KGlobalSettings>
#include <KDE/KLocale>
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
-#include <KTelepathy/Models/proxy-tree-node.h>
-#include <KTelepathy/Models/groups-model-item.h>
-#include <KTelepathy/Models/groups-model.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contact-model-item.h>
+#include <KTp/Models/proxy-tree-node.h>
+#include <KTp/Models/groups-model-item.h>
+#include <KTp/Models/groups-model.h>
const int SPACING = 4;
const int AVATAR_SIZE = 22;
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list