[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

Maximiliano Curia maxy at moszumanska.debian.org
Fri May 27 09:13:22 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=9f07843

The following commit has been merged in the master branch:
commit 9f07843d46497d170b12b00be254bef84558e1d6
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Dec 23 12:55:51 2011 +0100

    Fix renaming issues that were left off
    
    Reviewed-and-spotted-by: George Kiagiadakis
---
 CMakeLists.txt                                     |  2 +-
 src/CMakeLists.txt                                 | 14 +++++-----
 src/Messages.sh                                    |  2 +-
 src/ktp_approver.desktop                           | 30 ++--------------------
 src/ktp_approverrc                                 |  4 +--
 ...esktop.Telepathy.Client.KDE.Approver.service.in |  3 ---
 ...esktop.Telepathy.Client.KTp.Approver.service.in |  3 +++
 src/telepathy_kde_approverrc                       |  3 ---
 src/tpkdeapprovermodule.cpp                        |  2 +-
 9 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db14ab6..8b29de7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(telepathy_kde_approver)
+project(ktp-approver)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2bc2604..710a489 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(telepathy_kde_approver_SRCS
+set(ktp_approver_SRCS
     tpkdeapprovermodule.cpp
     approverdaemon.cpp
     dispatchoperation.cpp
@@ -10,16 +10,16 @@ set(telepathy_kde_approver_SRCS
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-kde4_add_plugin(kded_telepathy_kde_approver ${telepathy_kde_approver_SRCS})
-target_link_libraries(kded_telepathy_kde_approver ${KDE4_KDEUI_LIBS}
-                                                  ${TELEPATHY_QT4_LIBRARIES})
+kde4_add_plugin(kded_ktp_approver ${ktp_approver_SRCS})
+target_link_libraries(kded_ktp_approver ${KDE4_KDEUI_LIBS}
+                                        ${TELEPATHY_QT4_LIBRARIES})
 
 install(TARGETS kded_telepathy_kde_approver DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES ktp_approver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
 install(FILES telepathy_kde_approverrc DESTINATION ${CONFIG_INSTALL_DIR})
 
 find_file(DBUS_SEND_PATH dbus-send HINTS /usr/bin)
-configure_file(org.freedesktop.Telepathy.Client.KDE.Approver.service.in
-               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.Approver.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.Approver.service
+configure_file(org.freedesktop.Telepathy.Client.KTp.Approver.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.Approver.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.Approver.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
diff --git a/src/Messages.sh b/src/Messages.sh
index 1ac139b..92a5739 100644
--- a/src/Messages.sh
+++ b/src/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-approver.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kded_ktp_approver.pot
 #rm -f rc.cpp
diff --git a/src/ktp_approver.desktop b/src/ktp_approver.desktop
index 47ab6b0..511344b 100644
--- a/src/ktp_approver.desktop
+++ b/src/ktp_approver.desktop
@@ -1,34 +1,8 @@
 [Desktop Entry]
-Name=Telepathy KDE Approver
-Name[cs]=Schvalovatel KDE Telepathy
-Name[da]=Telepathy KDE-godkender
-Name[es]=Aprobador de KDE para Telepathy
-Name[et]=Telepathy KDE heakskiitja
-Name[fr]=Approbateur KDE pour Telepathy
-Name[hu]=Telepathy KDE Approver
-Name[it]=Approvatore KDE di Telepathy
-Name[km]= 
-Name[nl]=Telepathy KDE goedkeurder
-Name[pl]=Program zatwierdzający KDE dla Telepathy
-Name[pt]=Aprovador do KDE Telepathy
-Name[pt_BR]=Aprovador do KDE Telepathy
-Name[sv]=Telepathy KDE-godkännande
-Name[uk]=Засіб підтвердження викликів Telepathy у KDE
-Name[x-test]=xxTelepathy KDE Approverxx
+Name=Instant Messaging Approver
+Name[x-test]=xxInstant Messaging Approverxx
 Comment=Shows notifications for incoming IM/Call requests and allows you to open a handler to answer
 Comment[cs]=Zobrazuje upozornění pro příchozí IM/Hovory a umožňuje vám otevřít správce pro odpověď
-Comment[da]=Viser bekendtgørelser for indkommende IM- og opkaldsanmodninger og lader dig åbner en håndtering til at svare med
-Comment[es]=Muestra notificaciones de peticiones entrantes de MI o llamadas y le permite abrir un manipulador para responder
-Comment[et]=Sisenevate kiirsuhtlus- ja kõnesoovide märguannete näitamine ning neile vastamiseks käitleja avamine
-Comment[fr]=Affiche des notifications des requêtes de MI / d'appels entrants et permet d'ouvrir un module de réponse
-Comment[hu]=Értesítéseket jelenít meg bejövő azonnali üzeneteknél és hívásoknál, és lehetővé teszi egy kezelő megnyitását válaszoláshoz
-Comment[it]=Mostra le notifiche per messaggi in arrivo e richieste di chiamata e ti permette di aprire un gestore per rispondere
-Comment[nl]=Toont meldingen van binnenkomende IM/telefoonoproep en maakt het mogelijk dat u een antwoorder opent
-Comment[pl]=Pokazuje powiadomienia komunikatorów internetowych/żądań rozmowy telefonicznej i pozwala na otwieranie programu obsługującego, aby umożliwić odpowiedź
-Comment[pt]=Mostra as notificações dos pedidos de MI/chamadas recebidos e permite-lhe abrir um módulo de resposta
-Comment[pt_BR]=Mostra as notificações dos pedidos de MI/chamadas recebidos e permite-lhe abrir um módulo de resposta
-Comment[sv]=Visar underrättelser för inkommande direktmeddelanden eller samtal och låter dig öppna ett hanteringsverktyg för att svara
-Comment[uk]=Показує сповіщення щодо вхідних запитів щодо обміну повідомленнями або розмов і надає вам змогу відкрити панель відповіді
 Comment[x-test]=xxShows notifications for incoming IM/Call requests and allows you to open a handler to answerxx
 Type=Service
 X-KDE-ServiceTypes=KDEDModule
diff --git a/src/ktp_approverrc b/src/ktp_approverrc
index eb7df2e..c857691 100644
--- a/src/ktp_approverrc
+++ b/src/ktp_approverrc
@@ -1,3 +1,3 @@
 [HandlerPreferences]
-org.freedesktop.Telepathy.Channel.Type.Text=org.freedesktop.Telepathy.Client.KDE.TextUi
-org.freedesktop.Telepathy.Channel.Type.FileTransfer=org.freedesktop.Telepathy.Client.KDE.FileTransfer
+org.freedesktop.Telepathy.Channel.Type.Text=org.freedesktop.Telepathy.Client.KTp.TextUi
+org.freedesktop.Telepathy.Channel.Type.FileTransfer=org.freedesktop.Telepathy.Client.KTp.FileTransfer
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in b/src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in
deleted file mode 100644
index dc1b52f..0000000
--- a/src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.Approver
-Exec=@DBUS_SEND_PATH@ --session --type=method_call --dest=org.kde.kded /kded org.kde.kded.loadModule string:"telepathy_kde_approver"
diff --git a/src/org.freedesktop.Telepathy.Client.KTp.Approver.service.in b/src/org.freedesktop.Telepathy.Client.KTp.Approver.service.in
new file mode 100644
index 0000000..02e92e2
--- /dev/null
+++ b/src/org.freedesktop.Telepathy.Client.KTp.Approver.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.KTp.Approver
+Exec=@DBUS_SEND_PATH@ --session --type=method_call --dest=org.kde.kded /kded org.kde.kded.loadModule string:"ktp_approver"
diff --git a/src/telepathy_kde_approverrc b/src/telepathy_kde_approverrc
deleted file mode 100644
index eb7df2e..0000000
--- a/src/telepathy_kde_approverrc
+++ /dev/null
@@ -1,3 +0,0 @@
-[HandlerPreferences]
-org.freedesktop.Telepathy.Channel.Type.Text=org.freedesktop.Telepathy.Client.KDE.TextUi
-org.freedesktop.Telepathy.Channel.Type.FileTransfer=org.freedesktop.Telepathy.Client.KDE.FileTransfer
diff --git a/src/tpkdeapprovermodule.cpp b/src/tpkdeapprovermodule.cpp
index 525bf1e..d8ce5db 100644
--- a/src/tpkdeapprovermodule.cpp
+++ b/src/tpkdeapprovermodule.cpp
@@ -69,7 +69,7 @@ public:
 
     static inline KAboutData aboutData()
     {
-        KAboutData aboutData("telepathy_kde_approver", "telepathy-kde-approver", KLocalizedString(), "0.1",
+        KAboutData aboutData("ktp-approver", "kded_ktp_approver", KLocalizedString(), "0.2.60",
                              KLocalizedString(), KAboutData::License_LGPL,
                              ki18nc("@info:credit", "(C) 2010, Collabora Ltd."));
         aboutData.addAuthor(ki18nc("@info:credit", "George Kiagiadakis"),

-- 
ktp-approver packaging

More information about the pkg-kde-commits mailing list