[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=d5b0e6f

The following commit has been merged in the master branch:
commit d5b0e6fa71c2ac01ae9fdf105bf9f477a9ea1c42
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Oct 25 13:44:35 2011 +0100

    Move submodule to src directory
---
 .gitmodules          |  4 ++--
 CMakeLists.txt       | 11 +++++++++++
 common => src/common |  0
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index cc4154b..853a522 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "common"]
-	path = common
+[submodule "src/common"]
+	path = src/common
 	url = git://anongit.kde.org/telepathy-common-internals
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bef60ea..3690e31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,17 @@ include_directories (${KDE4_INCLUDES}
                      ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+execute_process(COMMAND git submodule init
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+execute_process(COMMAND git submodule update
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+
+
 add_subdirectory (src)
 add_subdirectory (data)
 add_subdirectory (plugins)
diff --git a/common b/src/common
similarity index 100%
rename from common
rename to src/common

-- 
ktp-accounts-kcm packaging