[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-4-7-g67dd98e

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=67ee502

The following commit has been merged in the master branch:
commit 67ee50250e34e7ddc2b629b49005071dd708aa99
Author: Diane Trout <diane at ghic.org>
Date:   Wed Jan 20 23:09:14 2016 -0800

    Add force-service-pic.patch to allow linking against service library from shared libraries. (Closes #80187)
---
 debian/changelog                       |  7 +++++++
 debian/patches/force-service-pic.patch | 13 +++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 179ff9f..a7182f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-qt (0.9.6.1-5) UNRELEASED; urgency=medium
+
+  * Add force-service-pic.patch to allow linking against service library
+    from shared libraries. (Closes #80187)
+
+ -- Diane Trout <diane at debian.org>  Tue, 19 Jan 2016 21:51:27 -0800
+
 telepathy-qt (0.9.6.1-4) unstable; urgency=medium
 
   * Update libssl depenency to libssl1.0.2 (Closes: #805555)
diff --git a/debian/patches/force-service-pic.patch b/debian/patches/force-service-pic.patch
new file mode 100644
index 0000000..41afa1a
--- /dev/null
+++ b/debian/patches/force-service-pic.patch
@@ -0,0 +1,13 @@
+Index: telepathy-qt-0.9.6.1/TelepathyQt/CMakeLists.txt
+===================================================================
+--- telepathy-qt-0.9.6.1.orig/TelepathyQt/CMakeLists.txt
++++ telepathy-qt-0.9.6.1/TelepathyQt/CMakeLists.txt
+@@ -953,6 +953,8 @@ if(ENABLE_SERVICE_SUPPORT)
+     #endif (ENABLE_COMPILER_COVERAGE)
+     # lets build a static only library until we have a stable API/ABI
+     add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
++    set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-service PROPERTIES
++                          POSITION_INDEPENDENT_CODE ON)
+ 
+     # generate service moc files
+     foreach(moc_src ${telepathy_qt_service_MOC_SRCS})
diff --git a/debian/patches/series b/debian/patches/series
index 900ffff..4782022 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 improve-doxygen-build.patch
 update-doxygen.patch
 gstreamer-1.5.patch
+force-service-pic.patch

-- 
telepathy-qt4 packaging