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

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 3ee18c5dde4c725a8b01e701fbfa67b1436aa0f8
Author: Diane Trout <diane at ghic.org>
Date:   Wed Apr 6 11:13:58 2016 -0700

    Update force-service-pic.patch to list some necessary dependencies (Closes: #819237)
---
 debian/changelog                       | 2 ++
 debian/patches/force-service-pic.patch | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c3bec..0331d40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 telepathy-qt (0.9.6.1-6) UNRELEASED; urgency=medium
 
   * Add fix-deprecated-bsd-source.patch
+  * Update force-service-pic.patch to list some necessary dependencies
+    (Closes: #819237)
 
  -- Diane Trout <diane at debian.org>  Fri, 25 Mar 2016 13:56:45 -0700
 
diff --git a/debian/patches/force-service-pic.patch b/debian/patches/force-service-pic.patch
index c431c33..9d1c180 100644
--- a/debian/patches/force-service-pic.patch
+++ b/debian/patches/force-service-pic.patch
@@ -3,14 +3,13 @@ Description: A temporary work around for linking the
  static library into a shared library. Upstream is
  going to make this a static library next release.
 Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801817
-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)
+--- a/TelepathyQt/CMakeLists.txt
++++ b/TelepathyQt/CMakeLists.txt
+@@ -953,6 +953,9 @@
      #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})
++    add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service all-generated-sources)
 +    set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-service PROPERTIES
 +                          POSITION_INDEPENDENT_CODE ON)
  

-- 
telepathy-qt4 packaging