[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:16:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=d714c87
The following commit has been merged in the master branch:
commit d714c87c699aace9dc24c5bbad1e5384f395a643
Author: Dan Vrátil <dvratil at redhat.com>
Date: Tue Jan 8 00:53:30 2013 +0100
Move applet to their folders and normalize naming
Move contact-applet to contact folder and org.kde.ktp.contactlist to
contactlist folder.
---
CMakeLists.txt | 11 ++---------
{contact-applet => contact}/CMakeLists.txt | 2 +-
{contact-applet => contact}/Messages.sh | 0
.../plasma-applet-ktp-contact.desktop | 2 +-
.../src/abstract-contact-delegate.cpp | 0
{contact-applet => contact}/src/abstract-contact-delegate.h | 0
{contact-applet => contact}/src/applet_config.cpp | 0
{contact-applet => contact}/src/applet_config.h | 0
{contact-applet => contact}/src/applet_config.ui | 0
{contact-applet => contact}/src/contact-delegate.cpp | 0
{contact-applet => contact}/src/contact-delegate.h | 0
{contact-applet => contact}/src/contact-wrapper.cpp | 0
{contact-applet => contact}/src/contact-wrapper.h | 0
.../src/declarative/contents/frames/away.png | Bin
.../src/declarative/contents/frames/busy.png | Bin
.../src/declarative/contents/frames/offline.png | Bin
.../src/declarative/contents/frames/online.png | Bin
.../src/declarative/contents/ui/Avatar.qml | 0
.../src/declarative/contents/ui/Contact.qml | 0
.../src/declarative/contents/ui/DropDownMenu.qml | 0
.../src/declarative/contents/ui/main.qml | 0
{contact-applet => contact}/src/telepathy-contact.cpp | 0
{contact-applet => contact}/src/telepathy-contact.h | 0
contactlist/CMakeLists.txt | 2 ++
.../org.kde.ktp-contactlist}/contents/frames/away.png | Bin
.../org.kde.ktp-contactlist}/contents/frames/busy.png | Bin
.../org.kde.ktp-contactlist}/contents/frames/offline.png | Bin
.../org.kde.ktp-contactlist}/contents/frames/online.png | Bin
.../contents/ui/ContactDisplayName.qml | 0
.../org.kde.ktp-contactlist}/contents/ui/ContactList.qml | 8 ++++----
.../org.kde.ktp-contactlist}/contents/ui/ExternalLabel.qml | 0
.../contents/ui/ListContactDelegate.qml | 0
.../org.kde.ktp-contactlist}/contents/ui/main.qml | 0
.../org.kde.ktp-contactlist}/metadata.desktop | 2 +-
34 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82ff826..de89903 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,6 @@ find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
find_package(TelepathyQt4 0.8.90 REQUIRED)
find_package(KTp REQUIRED)
-add_subdirectory(contact-applet)
-add_subdirectory(declarative-plugin)
+add_subdirectory(contact)
+add_subdirectory(contactlist)
-install(DIRECTORY org.kde.ktp.contactlist
- DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
-
-
-install(FILES org.kde.ktp.contactlist/metadata.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}
- RENAME plasma-applet-ktp-contactlist.desktop)
diff --git a/contact-applet/CMakeLists.txt b/contact/CMakeLists.txt
similarity index 94%
rename from contact-applet/CMakeLists.txt
rename to contact/CMakeLists.txt
index 1d5f838..b3234c8 100644
--- a/contact-applet/CMakeLists.txt
+++ b/contact/CMakeLists.txt
@@ -29,4 +29,4 @@ target_link_libraries(plasma_applet_ktp_contact
install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.ktp-contact)
install(TARGETS plasma_applet_ktp_contact DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma_applet_ktp_contact.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES plasma-applet-ktp-contact.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/contact-applet/Messages.sh b/contact/Messages.sh
similarity index 100%
rename from contact-applet/Messages.sh
rename to contact/Messages.sh
diff --git a/contact-applet/plasma_applet_ktp_contact.desktop b/contact/plasma-applet-ktp-contact.desktop
similarity index 99%
rename from contact-applet/plasma_applet_ktp_contact.desktop
rename to contact/plasma-applet-ktp-contact.desktop
index effa734..48afb06 100644
--- a/contact-applet/plasma_applet_ktp_contact.desktop
+++ b/contact/plasma-applet-ktp-contact.desktop
@@ -76,7 +76,7 @@ Icon=im-user
X-Plasma-DefaultSize=128,128
X-KDE-Library=plasma_applet_ktp_contact
-X-KDE-PluginInfo-Name=ktp_contact
+X-KDE-PluginInfo-Name=org.kde.ktp-contact
X-KDE-PluginInfo-Category=Online Services
X-KDE-PluginInfo-Author=Francesco Nwokeka
X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
diff --git a/contact-applet/src/abstract-contact-delegate.cpp b/contact/src/abstract-contact-delegate.cpp
similarity index 100%
rename from contact-applet/src/abstract-contact-delegate.cpp
rename to contact/src/abstract-contact-delegate.cpp
diff --git a/contact-applet/src/abstract-contact-delegate.h b/contact/src/abstract-contact-delegate.h
similarity index 100%
rename from contact-applet/src/abstract-contact-delegate.h
rename to contact/src/abstract-contact-delegate.h
diff --git a/contact-applet/src/applet_config.cpp b/contact/src/applet_config.cpp
similarity index 100%
rename from contact-applet/src/applet_config.cpp
rename to contact/src/applet_config.cpp
diff --git a/contact-applet/src/applet_config.h b/contact/src/applet_config.h
similarity index 100%
rename from contact-applet/src/applet_config.h
rename to contact/src/applet_config.h
diff --git a/contact-applet/src/applet_config.ui b/contact/src/applet_config.ui
similarity index 100%
rename from contact-applet/src/applet_config.ui
rename to contact/src/applet_config.ui
diff --git a/contact-applet/src/contact-delegate.cpp b/contact/src/contact-delegate.cpp
similarity index 100%
rename from contact-applet/src/contact-delegate.cpp
rename to contact/src/contact-delegate.cpp
diff --git a/contact-applet/src/contact-delegate.h b/contact/src/contact-delegate.h
similarity index 100%
rename from contact-applet/src/contact-delegate.h
rename to contact/src/contact-delegate.h
diff --git a/contact-applet/src/contact-wrapper.cpp b/contact/src/contact-wrapper.cpp
similarity index 100%
rename from contact-applet/src/contact-wrapper.cpp
rename to contact/src/contact-wrapper.cpp
diff --git a/contact-applet/src/contact-wrapper.h b/contact/src/contact-wrapper.h
similarity index 100%
rename from contact-applet/src/contact-wrapper.h
rename to contact/src/contact-wrapper.h
diff --git a/contact-applet/src/declarative/contents/frames/away.png b/contact/src/declarative/contents/frames/away.png
similarity index 100%
rename from contact-applet/src/declarative/contents/frames/away.png
rename to contact/src/declarative/contents/frames/away.png
diff --git a/contact-applet/src/declarative/contents/frames/busy.png b/contact/src/declarative/contents/frames/busy.png
similarity index 100%
rename from contact-applet/src/declarative/contents/frames/busy.png
rename to contact/src/declarative/contents/frames/busy.png
diff --git a/contact-applet/src/declarative/contents/frames/offline.png b/contact/src/declarative/contents/frames/offline.png
similarity index 100%
rename from contact-applet/src/declarative/contents/frames/offline.png
rename to contact/src/declarative/contents/frames/offline.png
diff --git a/contact-applet/src/declarative/contents/frames/online.png b/contact/src/declarative/contents/frames/online.png
similarity index 100%
rename from contact-applet/src/declarative/contents/frames/online.png
rename to contact/src/declarative/contents/frames/online.png
diff --git a/contact-applet/src/declarative/contents/ui/Avatar.qml b/contact/src/declarative/contents/ui/Avatar.qml
similarity index 100%
rename from contact-applet/src/declarative/contents/ui/Avatar.qml
rename to contact/src/declarative/contents/ui/Avatar.qml
diff --git a/contact-applet/src/declarative/contents/ui/Contact.qml b/contact/src/declarative/contents/ui/Contact.qml
similarity index 100%
rename from contact-applet/src/declarative/contents/ui/Contact.qml
rename to contact/src/declarative/contents/ui/Contact.qml
diff --git a/contact-applet/src/declarative/contents/ui/DropDownMenu.qml b/contact/src/declarative/contents/ui/DropDownMenu.qml
similarity index 100%
rename from contact-applet/src/declarative/contents/ui/DropDownMenu.qml
rename to contact/src/declarative/contents/ui/DropDownMenu.qml
diff --git a/contact-applet/src/declarative/contents/ui/main.qml b/contact/src/declarative/contents/ui/main.qml
similarity index 100%
rename from contact-applet/src/declarative/contents/ui/main.qml
rename to contact/src/declarative/contents/ui/main.qml
diff --git a/contact-applet/src/telepathy-contact.cpp b/contact/src/telepathy-contact.cpp
similarity index 100%
rename from contact-applet/src/telepathy-contact.cpp
rename to contact/src/telepathy-contact.cpp
diff --git a/contact-applet/src/telepathy-contact.h b/contact/src/telepathy-contact.h
similarity index 100%
rename from contact-applet/src/telepathy-contact.h
rename to contact/src/telepathy-contact.h
diff --git a/contactlist/CMakeLists.txt b/contactlist/CMakeLists.txt
new file mode 100644
index 0000000..025f749
--- /dev/null
+++ b/contactlist/CMakeLists.txt
@@ -0,0 +1,2 @@
+install(DIRECTORY org.kde.ktp-contactlist DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
+install(FILES org.kde.ktp-contactlist/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-contactlist.desktop)
diff --git a/org.kde.ktp.contactlist/contents/frames/away.png b/contactlist/org.kde.ktp-contactlist/contents/frames/away.png
similarity index 100%
rename from org.kde.ktp.contactlist/contents/frames/away.png
rename to contactlist/org.kde.ktp-contactlist/contents/frames/away.png
diff --git a/org.kde.ktp.contactlist/contents/frames/busy.png b/contactlist/org.kde.ktp-contactlist/contents/frames/busy.png
similarity index 100%
rename from org.kde.ktp.contactlist/contents/frames/busy.png
rename to contactlist/org.kde.ktp-contactlist/contents/frames/busy.png
diff --git a/org.kde.ktp.contactlist/contents/frames/offline.png b/contactlist/org.kde.ktp-contactlist/contents/frames/offline.png
similarity index 100%
rename from org.kde.ktp.contactlist/contents/frames/offline.png
rename to contactlist/org.kde.ktp-contactlist/contents/frames/offline.png
diff --git a/org.kde.ktp.contactlist/contents/frames/online.png b/contactlist/org.kde.ktp-contactlist/contents/frames/online.png
similarity index 100%
rename from org.kde.ktp.contactlist/contents/frames/online.png
rename to contactlist/org.kde.ktp-contactlist/contents/frames/online.png
diff --git a/org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactDisplayName.qml
similarity index 100%
rename from org.kde.ktp.contactlist/contents/ui/ContactDisplayName.qml
rename to contactlist/org.kde.ktp-contactlist/contents/ui/ContactDisplayName.qml
diff --git a/org.kde.ktp.contactlist/contents/ui/ContactList.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
similarity index 91%
rename from org.kde.ktp.contactlist/contents/ui/ContactList.qml
rename to contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
index 6ac2c4c..a1995c9 100644
--- a/org.kde.ktp.contactlist/contents/ui/ContactList.qml
+++ b/contactlist/org.kde.ktp-contactlist/contents/ui/ContactList.qml
@@ -18,7 +18,7 @@
***************************************************************************/
import QtQuick 1.1
-import org.kde.telepathy.contactlist 0.1 as KtpContactList
+import org.kde.telepathy 0.1 as KTp
import org.kde.plasma.components 0.1 as PlasmaComponents
import org.kde.plasma.core 0.1 as PlasmaCore
@@ -27,7 +27,7 @@ Item {
id: contactListContainer;
anchors.fill: parent;
- KtpContactList.ContactList {
+ KTp.ContactList {
id: contactList
}
@@ -90,8 +90,8 @@ Item {
}
Component.onCompleted : {
- contactList.filter.sortMode = KtpContactList.AccountsFilterModel.SortByPresence;
- contactList.filter.presenceTypeFilterFlags = KtpContactList.AccountsFilterModel.HideAllOffline
+ contactList.filter.sortMode = KTp.AccountsFilterModel.SortByPresence;
+ contactList.filter.presenceTypeFilterFlags = KTp.AccountsFilterModel.HideAllOffline
}
}
diff --git a/org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
similarity index 100%
rename from org.kde.ktp.contactlist/contents/ui/ExternalLabel.qml
rename to contactlist/org.kde.ktp-contactlist/contents/ui/ExternalLabel.qml
diff --git a/org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
similarity index 100%
rename from org.kde.ktp.contactlist/contents/ui/ListContactDelegate.qml
rename to contactlist/org.kde.ktp-contactlist/contents/ui/ListContactDelegate.qml
diff --git a/org.kde.ktp.contactlist/contents/ui/main.qml b/contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
similarity index 100%
rename from org.kde.ktp.contactlist/contents/ui/main.qml
rename to contactlist/org.kde.ktp-contactlist/contents/ui/main.qml
diff --git a/org.kde.ktp.contactlist/metadata.desktop b/contactlist/org.kde.ktp-contactlist/metadata.desktop
similarity index 98%
rename from org.kde.ktp.contactlist/metadata.desktop
rename to contactlist/org.kde.ktp-contactlist/metadata.desktop
index 6abe440..3c51358 100644
--- a/org.kde.ktp.contactlist/metadata.desktop
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop
@@ -73,7 +73,7 @@ X-Plasma-API=declarativeappletscript
X-Plasma-MainScript=ui/main.qml
X-Plasma-DefaultSize=200,300
-X-KDE-PluginInfo-Name=org.kde.ktp.contactlist
+X-KDE-PluginInfo-Name=org.kde.ktp-contactlist
X-KDE-PluginInfo-Category=Online Services
X-KDE-PluginInfo-Author=David Edmundson
X-KDE-PluginInfo-Email=kde at davidedmundson.co.uk
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list