[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:08:23 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=8dd61ca
The following commit has been merged in the master branch:
commit 8dd61cafabd5c9054dbe2567a6ba27499506832b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Thu Dec 22 18:44:59 2011 +0100
Rename contact list according to the new policy
Reviewed-by: Dario Freddi
REVIEW: 103507
CCMAIL: kde-i18n-doc at kde.org
---
CMakeLists.txt | 26 ++++++++--------
Messages.sh | 2 +-
abstract-contact-delegate.cpp | 8 ++---
avatar-button.cpp | 4 +--
cmake/modules/FindKTelepathy.cmake | 36 ----------------------
cmake/modules/FindKTp.cmake | 36 ++++++++++++++++++++++
contact-delegate-compact.cpp | 12 ++++----
contact-delegate.cpp | 12 ++++----
contact-list-widget.cpp | 12 ++++----
contact-overlays.cpp | 4 +--
context-menu.cpp | 14 ++++-----
dialogs/add-contact-dialog.cpp | 4 +--
dialogs/contact-info.cpp | 2 +-
dialogs/join-chat-room-dialog.cpp | 2 +-
global-presence-chooser.cpp | 4 +--
global-presence-chooser.h | 2 +-
...-contactlist.desktop => ktp-contactlist.desktop | 4 +--
main-widget.cpp | 6 ++--
main.cpp | 4 +--
presence-model.h | 2 +-
tooltips/contacttooltip.cpp | 6 ++--
21 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 792f563..a333f37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-project (telepathy-kde-contactlist)
+project (ktp-contactlist)
set (CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${CMAKE_MODULE_PATH}
)
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
set(KDE_MIN_VERSION "4.4.75")
find_package (KDE4 4.4.75 REQUIRED)
find_package (TelepathyQt4 0.8.90 REQUIRED)
-find_package (KTelepathy REQUIRED)
+find_package (KTp REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
@@ -19,11 +19,11 @@ add_definitions (${KDE4_DEFINITIONS}
include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
-set (contactlist_SRCS
+set (ktp_contactlist_SRCS
contact-list-widget.cpp
context-menu.cpp
avatar-button.cpp
@@ -54,7 +54,7 @@ set (contactlist_SRCS
)
-kde4_add_ui_files (contactlist_SRCS
+kde4_add_ui_files (ktp_contactlist_SRCS
main-widget.ui
dialogs/add-contact-dialog.ui
dialogs/join-chat-room-dialog.ui
@@ -65,25 +65,25 @@ kde4_add_ui_files (contactlist_SRCS
add_subdirectory (icons)
-kde4_add_executable (telepathy-kde-contactlist
- ${contactlist_SRCS}
+kde4_add_executable (ktp-contactlist
+ ${ktp_contactlist_SRCS}
)
-target_link_libraries (telepathy-kde-contactlist
+target_link_libraries (ktp-contactlist
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
- ${KTELEPATHY_MODELS_LIBRARIES}
+ ${KTP_LIBRARIES}
+ ${KTP_MODELS_LIBRARIES}
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
${KDE4_KCMUTILS_LIBS}
)
# Install:
-install (TARGETS telepathy-kde-contactlist
+install (TARGETS ktp-contactlist
DESTINATION ${BIN_INSTALL_DIR}
)
install(FILES ktelepathy.notifyrc DESTINATION ${DATA_INSTALL_DIR}/ktelepathy)
-install (PROGRAMS telepathy-kde-contactlist.desktop
+install (PROGRAMS ktp-contactlist.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
diff --git a/Messages.sh b/Messages.sh
index 951ba8f..9266f6b 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-kde-contactlist.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/ktp-contactlist.pot
rm -f rc.cpp
diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 62b8502..e32e623 100644
--- a/abstract-contact-delegate.cpp
+++ b/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/avatar-button.cpp b/avatar-button.cpp
index 539ce43..12ef76e 100644
--- a/avatar-button.cpp
+++ b/avatar-button.cpp
@@ -29,8 +29,8 @@
#include <KLocalizedString>
#include <KSharedConfig>
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/accounts-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/accounts-model-item.h>
#include "fetch-avatar-job.h"
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/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index a3a43c1..208fdee 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -33,12 +33,12 @@
#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 <KTelepathy/presence.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>
+#include <KTp/presence.h>
const int SPACING = 4;
const int AVATAR_SIZE = 22;
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 10ef1df..a7bbd7f 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -33,12 +33,12 @@
#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 <KTelepathy/presence.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>
+#include <KTp/presence.h>
const int SPACING = 4;
const int AVATAR_SIZE = 32;
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 283cc1a..e59ec51 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -25,12 +25,12 @@
#include <TelepathyQt/PendingChannelRequest>
#include <TelepathyQt/PendingReady>
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/groups-model.h>
-#include <KTelepathy/Models/accounts-filter-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
-#include <KTelepathy/Models/accounts-model-item.h>
-#include <KTelepathy/Models/groups-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/groups-model.h>
+#include <KTp/Models/accounts-filter-model.h>
+#include <KTp/Models/contact-model-item.h>
+#include <KTp/Models/accounts-model-item.h>
+#include <KTp/Models/groups-model-item.h>
#include <KGlobal>
#include <KSharedConfig>
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 8eea7a7..339a601 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -25,8 +25,8 @@
#include <KIconLoader>
#include <KDebug>
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contact-model-item.h>
class GuiItemContactViewHoverButton : public ContactViewHoverButton
{
diff --git a/context-menu.cpp b/context-menu.cpp
index d97bf35..e98392e 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -28,12 +28,12 @@
#include <KInputDialog>
#include <KMessageBox>
-#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 <KTelepathy/text-parser.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>
+#include <KTp/text-parser.h>
#include <TelepathyQt/ContactManager>
@@ -41,7 +41,7 @@
#include "dialogs/contact-info.h"
#include "contact-list-widget_p.h"
-#include <KTelepathy/Models/accounts-filter-model.h>
+#include <KTp/Models/accounts-filter-model.h>
ContextMenu::ContextMenu(ContactListWidget *mainWidget)
: QObject(mainWidget)
diff --git a/dialogs/add-contact-dialog.cpp b/dialogs/add-contact-dialog.cpp
index 23ca649..2b5901f 100644
--- a/dialogs/add-contact-dialog.cpp
+++ b/dialogs/add-contact-dialog.cpp
@@ -21,8 +21,8 @@
#include "add-contact-dialog.h"
#include "ui_add-contact-dialog.h"
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/accounts-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/accounts-model-item.h>
#include <QObject>
#include <QSortFilterProxyModel>
diff --git a/dialogs/contact-info.cpp b/dialogs/contact-info.cpp
index c791ade..5fed52a 100644
--- a/dialogs/contact-info.cpp
+++ b/dialogs/contact-info.cpp
@@ -28,7 +28,7 @@
#include <KProtocolInfo>
-#include <KTelepathy/text-parser.h>
+#include <KTp/text-parser.h>
#include <KDebug>
ContactInfo::ContactInfo(const Tp::ContactPtr &contact, QWidget *parent) :
diff --git a/dialogs/join-chat-room-dialog.cpp b/dialogs/join-chat-room-dialog.cpp
index f5c77a7..164f910 100644
--- a/dialogs/join-chat-room-dialog.cpp
+++ b/dialogs/join-chat-room-dialog.cpp
@@ -21,7 +21,7 @@
#include "join-chat-room-dialog.h"
#include "ui_join-chat-room-dialog.h"
-#include <KTelepathy/Models/accounts-model.h>
+#include <KTp/Models/accounts-model.h>
#include <KDE/KPushButton>
diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index bd66363..935f582 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -22,8 +22,8 @@
#include "presence-model.h"
-#include <KTelepathy/global-presence.h>
-#include <KTelepathy/presence.h>
+#include <KTp/global-presence.h>
+#include <KTp/presence.h>
#include "dialogs/custom-presence-dialog.h"
diff --git a/global-presence-chooser.h b/global-presence-chooser.h
index 69ca6a6..2c4a0ec 100644
--- a/global-presence-chooser.h
+++ b/global-presence-chooser.h
@@ -24,7 +24,7 @@
#include <KComboBox>
#include <TelepathyQt/AccountManager>
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
class KPixmapSequenceOverlayPainter;
class PresenceModel;
diff --git a/telepathy-kde-contactlist.desktop b/ktp-contactlist.desktop
similarity index 98%
rename from telepathy-kde-contactlist.desktop
rename to ktp-contactlist.desktop
index 40eb05c..aa79785 100644
--- a/telepathy-kde-contactlist.desktop
+++ b/ktp-contactlist.desktop
@@ -8,7 +8,7 @@ Name[et]=Telepathy kontaktide nimekiri
Name[fr]=Liste de contacts de Telepathy
Name[hu]=Telepathy partnerlista
Name[it]=Lista dei contatti di Telepathy
-Name[km]=
+Name[km]=
Name[nds]=Telepathy-Kontaktenlist
Name[nl]=Contactenlijst van Telepathy
Name[pl]=Lista kontaktów Telepathy
@@ -50,7 +50,7 @@ Comment[pt_BR]=Mostrar os contatos do seu mensageiro instantâneo
Comment[sv]=Visar dina direktmeddelandekontakter
Comment[uk]=Показ записів контактів вашої програми для миттєвого обміну повідомленнями
Comment[x-test]=xxDisplays your instant messenger contactsxx
-Exec=telepathy-kde-contactlist %u
+Exec=ktp-contactlist %u
Type=Application
Terminal=false
Icon=telepathy-kde
diff --git a/main-widget.cpp b/main-widget.cpp
index 4adc60d..7ad1240 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -35,9 +35,9 @@
#include <TelepathyQt/PendingContacts>
#include <TelepathyQt/ContactManager>
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
-#include <KTelepathy/Models/groups-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/contact-model-item.h>
+#include <KTp/Models/groups-model-item.h>
#include <KDebug>
#include <KDialog>
diff --git a/main.cpp b/main.cpp
index 425a83b..2e9c368 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,8 +33,8 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData("telepathy-kde-contactlist", 0, ki18n("Telepathy KDE Contact List"), "0.2.60",
- ki18n("Telepathy KDE Contact List"), KAboutData::License_GPL,
+ KAboutData aboutData("ktp-contactlist", 0, ki18n("KDE Telepathy Contact List"), "0.2.60",
+ ki18n("KDE Telepathy Contact List"), KAboutData::License_GPL,
ki18n("(C) 2011, Martin Klapetek"));
aboutData.addAuthor(ki18nc("@info:credit", "Martin Klapetek"), ki18n("Developer"),
diff --git a/presence-model.h b/presence-model.h
index d6a03c4..2ce652f 100644
--- a/presence-model.h
+++ b/presence-model.h
@@ -21,7 +21,7 @@
#ifndef PRESENCEMODEL_H
#define PRESENCEMODEL_H
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
#include <QAbstractListModel>
diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 942234a..46981fa 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -24,9 +24,9 @@
#include "ui_contacttooltip.h"
#include "ktooltip.h"
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/text-parser.h>
-#include <KTelepathy/presence.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/text-parser.h>
+#include <KTp/presence.h>
#include <QDesktopServices>
#include <QTextDocument>
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list