[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=aff21e4

The following commit has been merged in the master branch:
commit aff21e41301af4930eae2e2f0eb8cf97b3f376f2
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Oct 3 14:39:37 2011 +0100

    Move pretty headers in KCMTelepathyAccounts
    
    In this way the headers will be found by plugins
---
 CMakeLists.txt                                     |  1 +
 .../{include => }/AbstractAccountParametersWidget  |  0
 .../{include => }/AbstractAccountUi                |  0
 .../{include => }/AbstractAccountUiPlugin          |  0
 .../{include => }/AccountEditWidget                |  0
 src/KCMTelepathyAccounts/CMakeLists.txt            | 26 +++++++++++-----------
 .../{include => }/ConnectionManagerItem            |  0
 .../{include => }/GenericAdvancedOptionsWidget     |  0
 .../{include => }/ParameterEditModel               |  0
 .../{include => }/ParameterEditWidget              |  0
 .../{include => }/PluginMacros                     |  0
 .../{include => }/PluginManager                    |  0
 .../{include => }/ProtocolItem                     |  0
 .../{include => }/ProtocolParameterValue           |  0
 .../{include => }/ProtocolSelectWidget             |  0
 .../{include => }/ValidatedLineEdit                |  0
 16 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7224fa9..bef60ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ add_definitions (${KDE4_DEFINITIONS})
 
 include_directories (${KDE4_INCLUDES}
                      ${TELEPATHY_QT4_INCLUDE_DIR}
+                     ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
 add_subdirectory (src)
diff --git a/src/KCMTelepathyAccounts/include/AbstractAccountParametersWidget b/src/KCMTelepathyAccounts/AbstractAccountParametersWidget
similarity index 100%
rename from src/KCMTelepathyAccounts/include/AbstractAccountParametersWidget
rename to src/KCMTelepathyAccounts/AbstractAccountParametersWidget
diff --git a/src/KCMTelepathyAccounts/include/AbstractAccountUi b/src/KCMTelepathyAccounts/AbstractAccountUi
similarity index 100%
rename from src/KCMTelepathyAccounts/include/AbstractAccountUi
rename to src/KCMTelepathyAccounts/AbstractAccountUi
diff --git a/src/KCMTelepathyAccounts/include/AbstractAccountUiPlugin b/src/KCMTelepathyAccounts/AbstractAccountUiPlugin
similarity index 100%
rename from src/KCMTelepathyAccounts/include/AbstractAccountUiPlugin
rename to src/KCMTelepathyAccounts/AbstractAccountUiPlugin
diff --git a/src/KCMTelepathyAccounts/include/AccountEditWidget b/src/KCMTelepathyAccounts/AccountEditWidget
similarity index 100%
rename from src/KCMTelepathyAccounts/include/AccountEditWidget
rename to src/KCMTelepathyAccounts/AccountEditWidget
diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
index 3130b4e..4a3d2f8 100644
--- a/src/KCMTelepathyAccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@ -41,19 +41,19 @@ set (libkcmtelepathyaccounts_HDRS
 )
 
 set (libkcmtelepathyaccounts_PRETTY_HDRS
-     include/AbstractAccountUiPlugin
-     include/AbstractAccountUi
-     include/AbstractAccountParametersWidget
-     include/GenericAdvancedOptionsWidget
-     include/AccountEditWidget
-     include/PluginMacros
-     include/ConnectionManagerItem
-     include/PluginManager
-     include/ProtocolSelectWidget
-     include/ProtocolItem
-     include/ParameterEditWidget
-     include/ParameterEditModel
-     include/ValidatedLineEdit
+     AbstractAccountUiPlugin
+     AbstractAccountUi
+     AbstractAccountParametersWidget
+     GenericAdvancedOptionsWidget
+     AccountEditWidget
+     PluginMacros
+     ConnectionManagerItem
+     PluginManager
+     ProtocolSelectWidget
+     ProtocolItem
+     ParameterEditWidget
+     ParameterEditModel
+     ValidatedLineEdit
 )
 
 kde4_add_ui_files (libkcmtelepathyaccounts_SRCS
diff --git a/src/KCMTelepathyAccounts/include/ConnectionManagerItem b/src/KCMTelepathyAccounts/ConnectionManagerItem
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ConnectionManagerItem
rename to src/KCMTelepathyAccounts/ConnectionManagerItem
diff --git a/src/KCMTelepathyAccounts/include/GenericAdvancedOptionsWidget b/src/KCMTelepathyAccounts/GenericAdvancedOptionsWidget
similarity index 100%
rename from src/KCMTelepathyAccounts/include/GenericAdvancedOptionsWidget
rename to src/KCMTelepathyAccounts/GenericAdvancedOptionsWidget
diff --git a/src/KCMTelepathyAccounts/include/ParameterEditModel b/src/KCMTelepathyAccounts/ParameterEditModel
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ParameterEditModel
rename to src/KCMTelepathyAccounts/ParameterEditModel
diff --git a/src/KCMTelepathyAccounts/include/ParameterEditWidget b/src/KCMTelepathyAccounts/ParameterEditWidget
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ParameterEditWidget
rename to src/KCMTelepathyAccounts/ParameterEditWidget
diff --git a/src/KCMTelepathyAccounts/include/PluginMacros b/src/KCMTelepathyAccounts/PluginMacros
similarity index 100%
rename from src/KCMTelepathyAccounts/include/PluginMacros
rename to src/KCMTelepathyAccounts/PluginMacros
diff --git a/src/KCMTelepathyAccounts/include/PluginManager b/src/KCMTelepathyAccounts/PluginManager
similarity index 100%
rename from src/KCMTelepathyAccounts/include/PluginManager
rename to src/KCMTelepathyAccounts/PluginManager
diff --git a/src/KCMTelepathyAccounts/include/ProtocolItem b/src/KCMTelepathyAccounts/ProtocolItem
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ProtocolItem
rename to src/KCMTelepathyAccounts/ProtocolItem
diff --git a/src/KCMTelepathyAccounts/include/ProtocolParameterValue b/src/KCMTelepathyAccounts/ProtocolParameterValue
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ProtocolParameterValue
rename to src/KCMTelepathyAccounts/ProtocolParameterValue
diff --git a/src/KCMTelepathyAccounts/include/ProtocolSelectWidget b/src/KCMTelepathyAccounts/ProtocolSelectWidget
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ProtocolSelectWidget
rename to src/KCMTelepathyAccounts/ProtocolSelectWidget
diff --git a/src/KCMTelepathyAccounts/include/ValidatedLineEdit b/src/KCMTelepathyAccounts/ValidatedLineEdit
similarity index 100%
rename from src/KCMTelepathyAccounts/include/ValidatedLineEdit
rename to src/KCMTelepathyAccounts/ValidatedLineEdit

-- 
ktp-accounts-kcm packaging