[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=3ce8c65

The following commit has been merged in the master branch:
commit 3ce8c651690d5b077bb872a11513eb956c10e475
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Dec 2 17:53:39 2014 +0100

    Move ContactInfoDialog to Widgets
    
    REVIEW: 121124
---
 KTp/CMakeLists.txt                        | 2 --
 KTp/Widgets/CMakeLists.txt                | 2 ++
 KTp/{ => Widgets}/contact-info-dialog.cpp | 0
 KTp/{ => Widgets}/contact-info-dialog.h   | 0
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index cd94aef..5461dd0 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -6,7 +6,6 @@ set (ktp_common_internals_private_SRCS
      account-factory.cpp
      actions.cpp
      capabilities-hack-private.cpp
-     contact-info-dialog.cpp
      circular-countdown.cpp
      contact.cpp
      contact-factory.cpp
@@ -38,7 +37,6 @@ set (ktp_common_internals_private_HDRS
      actions.h
      circular-countdown.h
      contact.h
-     contact-info-dialog.h
      contact-factory.h
      core.h
      debug.h
diff --git a/KTp/Widgets/CMakeLists.txt b/KTp/Widgets/CMakeLists.txt
index 64642bb..b183874 100644
--- a/KTp/Widgets/CMakeLists.txt
+++ b/KTp/Widgets/CMakeLists.txt
@@ -6,6 +6,7 @@ set (ktp_widgets_private_SRCS
     contact-view-widget.cpp
     contact-grid-widget.cpp
     contact-grid-dialog.cpp
+    contact-info-dialog.cpp
     add-contact-dialog.cpp
     join-chat-room-dialog.cpp
     notification-config-dialog.cpp
@@ -18,6 +19,7 @@ set (ktp_widgets_private_HDRS
      contact-view-widget.h
      contact-grid-widget.h
      contact-grid-dialog.h
+     contact-info-dialog.h
      add-contact-dialog.h
      join-chat-room-dialog.h
      notification-config-dialog.h
diff --git a/KTp/contact-info-dialog.cpp b/KTp/Widgets/contact-info-dialog.cpp
similarity index 100%
rename from KTp/contact-info-dialog.cpp
rename to KTp/Widgets/contact-info-dialog.cpp
diff --git a/KTp/contact-info-dialog.h b/KTp/Widgets/contact-info-dialog.h
similarity index 100%
rename from KTp/contact-info-dialog.h
rename to KTp/Widgets/contact-info-dialog.h

-- 
ktp-common-internals packaging