Merge lp:~noskcaj/ubuntu/saucy/ktp-call-ui/0.6.3-1 into lp:ubuntu/saucy/ktp-call-ui

[Jackson Doak]

Merged from debian unstable

[Martin Pitt (pitti)]

Thanks, uploaded (note that there is some patch noise, but we have an Ubuntu specific patch anyway).

review: Approve

[Martin Pitt (pitti)]

This fails to build: https://launchpad.net/ubuntu/+source/ktp-call-ui/0.6.3-1ubuntu1

Can you please investigate? Thanks!

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2013-08-15 20:37:37 +0000
@@ -0,0 +1,2 @@
+telepathy-farstream-0.4.patch
+dbus_include.patch

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2013-01-09 12:39:07 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-telepathy-farstream-0.4

=== added directory '.pc/dbus_include.patch'
=== added file '.pc/dbus_include.patch/.timestamp'
=== added directory '.pc/dbus_include.patch/libqtf'
=== added file '.pc/dbus_include.patch/libqtf/CMakeLists.txt'
--- .pc/dbus_include.patch/libqtf/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ .pc/dbus_include.patch/libqtf/CMakeLists.txt	2013-08-15 20:37:37 +0000
@@ -0,0 +1,28 @@
+# This is *A LOT* of dependencies to find one by one,
+# since gnome people like to include as many headers as possible
+# in their public headers instead of doing forward declarations.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream-0.4)
+pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${TP_FARSTREAM_INCLUDE_DIRS}
+    ${FARSTREAM_INCLUDE_DIRS}
+    ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
+)
+
+add_definitions(
+    # These prevent gstreamer from including libxml2 headers
+    -DGST_DISABLE_XML
+    -DGST_DISABLE_LOADSAVE
+)
+
+kde4_add_library(qtf STATIC qtf.cpp)
+
+target_link_libraries(qtf
+    ${QTGSTREAMER_LIBRARIES}
+    ${TP_FARSTREAM_LDFLAGS}
+    ${FARSTREAM_LDFLAGS}
+    ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
+)

=== removed directory '.pc/telepathy-farstream-0.4'
=== added directory '.pc/telepathy-farstream-0.4.patch'
=== added file '.pc/telepathy-farstream-0.4.patch/.timestamp'
=== added directory '.pc/telepathy-farstream-0.4.patch/libqtf'
=== added file '.pc/telepathy-farstream-0.4.patch/libqtf/CMakeLists.txt'
--- .pc/telepathy-farstream-0.4.patch/libqtf/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ .pc/telepathy-farstream-0.4.patch/libqtf/CMakeLists.txt	2013-08-15 20:37:37 +0000
@@ -0,0 +1,28 @@
+# This is *A LOT* of dependencies to find one by one,
+# since gnome people like to include as many headers as possible
+# in their public headers instead of doing forward declarations.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
+pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${TP_FARSTREAM_INCLUDE_DIRS}
+    ${FARSTREAM_INCLUDE_DIRS}
+    ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
+)
+
+add_definitions(
+    # These prevent gstreamer from including libxml2 headers
+    -DGST_DISABLE_XML
+    -DGST_DISABLE_LOADSAVE
+)
+
+kde4_add_library(qtf STATIC qtf.cpp)
+
+target_link_libraries(qtf
+    ${QTGSTREAMER_LIBRARIES}
+    ${TP_FARSTREAM_LDFLAGS}
+    ${FARSTREAM_LDFLAGS}
+    ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
+)

=== removed directory '.pc/telepathy-farstream-0.4/libqtf'
=== removed file '.pc/telepathy-farstream-0.4/libqtf/CMakeLists.txt'
--- .pc/telepathy-farstream-0.4/libqtf/CMakeLists.txt	2013-01-09 12:39:07 +0000
+++ .pc/telepathy-farstream-0.4/libqtf/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# This is *A LOT* of dependencies to find one by one,
-# since gnome people like to include as many headers as possible
-# in their public headers instead of doing forward declarations.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
-pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${TP_FARSTREAM_INCLUDE_DIRS}
-    ${FARSTREAM_INCLUDE_DIRS}
-    ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
-)
-
-add_definitions(
-    # These prevent gstreamer from including libxml2 headers
-    -DGST_DISABLE_XML
-    -DGST_DISABLE_LOADSAVE
-)
-
-kde4_add_library(qtf STATIC qtf.cpp)
-
-target_link_libraries(qtf
-    ${QTGSTREAMER_LIBRARIES}
-    ${TP_FARSTREAM_LDFLAGS}
-    ${FARSTREAM_LDFLAGS}
-    ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
-)

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-06 21:34:24 +0000
+++ debian/changelog	2013-08-15 20:37:37 +0000
@@ -1,3 +1,33 @@
+ktp-call-ui (0.6.3-1ubuntu1) saucy; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - add debian/patches/telepathy-farstream-0.4.patch
+    - build depend on libtelepathy-farstream-0.4-dev rather than
+      libtelepathy-farstream-dev
+
+ -- Jackson Doak <[e-mail]>  Fri, 16 Aug 2013 06:29:41 +1000
+
+ktp-call-ui (0.6.3-1) unstable; urgency=low
+
+  [ Diane Trout ]
+  * Imported Upstream version 0.6.2
+  * Bump ktp-common-internals dependency to 0.6.2
+  * Bump libtelepathy-qt4-dev dependency to 0.9.3
+  * Bump libfarstream-0.1-dev dependency to 0.1.2
+  * Add patch to link libqtf against d-bus.
+  * Update CMAKE_FLAGS to for header files in subdirectories.
+  * Set Uploaders to Diane Trout and Michał Zając
+  * Install ktp-dialout-ui
+  * Bump Standards-Version to 3.9.4. No changes needed.
+  * Update watch file as KDE-Telepathy is now in KDE stable.
+
+  [ Mark Purcell ] 
+  * Imported Upstream version 0.6.3
+  * Add myself to Uploaders
+  * Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)
+
+ -- Mark Purcell <[e-mail]>  Sun, 11 Aug 2013 10:25:30 +1000
+
 ktp-call-ui (0.6.3-0ubuntu1) saucy; urgency=low
 
   * New upstream release (LP: #1208837)

=== modified file 'debian/control'
--- debian/control	2013-08-06 21:34:24 +0000
+++ debian/control	2013-08-15 20:37:37 +0000
@@ -3,18 +3,18 @@
 Priority: optional
 Maintainer: Kubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]>
-Uploaders: George Kiagiadakis <[e-mail]>
+Uploaders: Diane Trout <[e-mail]>, Michał Zając <[e-mail]>, Mark Purcell <[e-mail]>
 Build-Depends: debhelper (>= 9),
  pkg-kde-tools,
  cmake,
  kdelibs5-dev,
- libtelepathy-qt4-dev (>= 0.9.1),
+ libtelepathy-qt4-dev (>= 0.9.3),
  libqtgstreamer-dev (>= 0.10.2),
  pkg-config,
  libktpcommoninternalsprivate-dev (>= 0.6.3),
  libtelepathy-farstream-0.4-dev (>= 0.4.0),
- libfarstream-0.1-dev (>= 0.1.1)
-Standards-Version: 3.9.3
+ libfarstream-0.1-dev (>= 0.1.2)
+Standards-Version: 3.9.4
 Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-call-ui
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git
@@ -22,7 +22,7 @@
 Package: kde-telepathy-call-ui
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- kde-telepathy-data (>= 0.4.0),
+ kde-telepathy-data (>= 0.6.1),
  gstreamer0.10-plugins-base,
  gstreamer0.10-plugins-good,
  gstreamer0.10-x,

=== added file 'debian/patches/dbus_include.patch'
--- debian/patches/dbus_include.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dbus_include.patch	2013-08-15 20:37:37 +0000
@@ -0,0 +1,14 @@
+Author: Diane Trout <[e-mail]>
+Description: link qtf against d-bus to avoid a missing symbols error.
+Index: ktp-call-ui/libqtf/CMakeLists.txt
+===================================================================
+--- ktp-call-ui.orig/libqtf/CMakeLists.txt	2013-08-16 06:33:07.675498642 +1000
++++ ktp-call-ui/libqtf/CMakeLists.txt	2013-08-16 06:33:07.671498606 +1000
+@@ -10,6 +10,7 @@
+     ${TP_FARSTREAM_INCLUDE_DIRS}
+     ${FARSTREAM_INCLUDE_DIRS}
+     ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
++    ${DBUS_INCLUDE_DIR}
+ )
+ 
+ add_definitions(

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-09 12:39:07 +0000
+++ debian/patches/series	2013-08-15 20:37:37 +0000
@@ -1,1 +1,2 @@
-telepathy-farstream-0.4
+telepathy-farstream-0.4.patch
+dbus_include.patch

=== removed file 'debian/patches/telepathy-farstream-0.4'
--- debian/patches/telepathy-farstream-0.4	2013-01-09 12:39:07 +0000
+++ debian/patches/telepathy-farstream-0.4	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Description: Look for telepathy-farstream-0.4.pc instead of telepathy-farstream.pc
- (in Ubuntu we have created a parallel-installable tp-farstream for the sake of
- KDE packages)
-Author: Iain Lane <[e-mail]>
-Forwarded: not-needed
-
-Index: b/libqtf/CMakeLists.txt
-===================================================================
---- a/libqtf/CMakeLists.txt
-+++ b/libqtf/CMakeLists.txt
-@@ -2,7 +2,7 @@
- # since gnome people like to include as many headers as possible
- # in their public headers instead of doing forward declarations.
- find_package(PkgConfig REQUIRED)
--pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
-+pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream-0.4)
- pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
- 
- include_directories(

=== added file 'debian/patches/telepathy-farstream-0.4.patch'
--- debian/patches/telepathy-farstream-0.4.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/telepathy-farstream-0.4.patch	2013-08-15 20:37:37 +0000
@@ -0,0 +1,19 @@
+Description: Look for telepathy-farstream-0.4.pc instead of telepathy-farstream.pc
+ (in Ubuntu we have created a parallel-installable tp-farstream for the sake of
+ KDE packages)
+Author: Iain Lane <[e-mail]>
+Forwarded: not-needed
+
+Index: ktp-call-ui/libqtf/CMakeLists.txt
+===================================================================
+--- ktp-call-ui.orig/libqtf/CMakeLists.txt	2013-08-16 06:33:02.175471361 +1000
++++ ktp-call-ui/libqtf/CMakeLists.txt	2013-08-16 06:33:02.171471331 +1000
+@@ -2,7 +2,7 @@
+ # since gnome people like to include as many headers as possible
+ # in their public headers instead of doing forward declarations.
+ find_package(PkgConfig REQUIRED)
+-pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
++pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream-0.4)
+ pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
+ 
+ include_directories(

=== modified file 'debian/rules'
--- debian/rules	2012-06-18 22:15:39 +0000
+++ debian/rules	2013-08-15 20:37:37 +0000
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
 
+CMAKE_FLAGS := \
+    -DTP_FARSTREAM_INCLUDE_DIRS=/usr/include/telepathy-1.0 \
+    -DDBUS_INCLUDE_DIR=/usr/include/dbus-1.0
+
 %:
 	dh $@ --parallel --with kde --dbg-package=kde-telepathy-call-ui-dbg --list-missing
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CMAKE_FLAGS)

=== modified file 'libqtf/CMakeLists.txt'
--- libqtf/CMakeLists.txt	2013-01-09 12:39:07 +0000
+++ libqtf/CMakeLists.txt	2013-08-15 20:37:37 +0000
@@ -10,6 +10,7 @@
     ${TP_FARSTREAM_INCLUDE_DIRS}
     ${FARSTREAM_INCLUDE_DIRS}
     ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
+    ${DBUS_INCLUDE_DIR}
 )
 
 add_definitions(