[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.3-1-36-g3f24e4e

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 7de3852e441372d15a42f1ca65119451f0ebdb9e
Author: Diane Trout <diane at ghic.org>
Date:   Sat Jun 14 10:46:21 2014 -0700

    Remove create_moc_command.patch. Applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/create_moc_command.patch | 28 ----------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb7797b..a7dc654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ telepathy-qt (0.9.4-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Verify upstream pgp signature.
   * Remove fix_storing_avatars.patch. Applied upstream.
+  * Remove create_moc_command.patch. Applied upstream.
 
  -- Diane Trout <diane at ghic.org>  Sat, 14 Jun 2014 10:17:26 -0700
 
diff --git a/debian/patches/create_moc_command.patch b/debian/patches/create_moc_command.patch
deleted file mode 100644
index 5e12118..0000000
--- a/debian/patches/create_moc_command.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: David Edmundson <kde at davidedmundson.co.uk>
-Description: Recent cmake has changed the argument count to
- qt4_create_moc_command, we need to adjust accordingly.
- Reviewed-by: Dario Freddi <dario.freddi at ispirata.com>
-Origin: upstream, http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=05fe3f4980bbc6b016e25dcf07e44afe29e377c0
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
- 
- MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-   IF(QT_VERSION_MAJOR MATCHES 4)
--    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-   ELSE(QT_VERSION_MAJOR MATCHES 4)
-     IF(QT_VERSION_MAJOR MATCHES 5)
--      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-     ENDIF(QT_VERSION_MAJOR MATCHES 5)
-   ENDIF(QT_VERSION_MAJOR MATCHES 4)
- ENDMACRO(QT_CREATE_MOC_COMMAND)
diff --git a/debian/patches/series b/debian/patches/series
index 7981047..e505833 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 link-against-gobject.patch
-create_moc_command.patch

-- 
telepathy-qt4 packaging