summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Brooks <john.brooks@jollamobile.com>2014-06-19 05:35:51 -0600
committerDavid Edmundson <kde@davidedmundson.co.uk>2014-06-19 15:17:49 +0200
commit4fca056a8011ff14769f858e53ea65b47ded4b19 (patch)
tree360780b7ecf08cf4f70c1b9a653e797677cd5c2f
parent1916533698d0212bad4e0af5168db4992ceef99d (diff)
Fix Qt5 pkgconfig dependencies for Farstream
0191a6dd fixed the pkgconfig dependencies for Qt5, but missed updating TelepathyQtFarstream and two other files. Reviewed-by: David Edmundson <davidedmundson@kde.org>
-rw-r--r--TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in2
-rw-r--r--TelepathyQt/Farstream/TelepathyQtFarstream.pc.in2
-rw-r--r--TelepathyQt/TelepathyQtService-uninstalled.pc.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
index 1c608ada..8861e361 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
6Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy) 6Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy)
7Description: Qt Telepathy Farstream utility library for the Telepathy framework 7Description: Qt Telepathy Farstream utility library for the Telepathy framework
8Version: ${PACKAGE_VERSION} 8Version: ${PACKAGE_VERSION}
9Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} 9Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
10Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so 10Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so
11Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} 11Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
index 1a66d6d8..ccebb472 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
6Name: TelepathyQt${QT_VERSION_MAJOR}Farstream 6Name: TelepathyQt${QT_VERSION_MAJOR}Farstream
7Description: Qt Telepathy Farstream utility library for the Telepathy framework 7Description: Qt Telepathy Farstream utility library for the Telepathy framework
8Version: ${PACKAGE_VERSION} 8Version: ${PACKAGE_VERSION}
9Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} 9Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
10Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream 10Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream
11Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} 11Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
diff --git a/TelepathyQt/TelepathyQtService-uninstalled.pc.in b/TelepathyQt/TelepathyQtService-uninstalled.pc.in
index 2a4b0bc1..01cd1ba5 100644
--- a/TelepathyQt/TelepathyQtService-uninstalled.pc.in
+++ b/TelepathyQt/TelepathyQtService-uninstalled.pc.in
@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
6Name: TelepathyQt${QT_VERSION_MAJOR}Service (uninstalled copy) 6Name: TelepathyQt${QT_VERSION_MAJOR}Service (uninstalled copy)
7Description: Qt Telepathy Service side bindings 7Description: Qt Telepathy Service side bindings
8Version: ${PACKAGE_VERSION} 8Version: ${PACKAGE_VERSION}
9Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} 9Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
10Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-service.so 10Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-service.so
11Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} 11Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}