Ubuntu
ktp-call-ui package

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

  1. Saucy (13.10)
  2. 0.6.3-1
  3. Merge into saucy
Proposed by Jackson Doak
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~noskcaj/ubuntu/saucy/ktp-call-ui/0.6.3-1
Merge into: lp:ubuntu/saucy/ktp-call-ui
Diff against target: 296 lines (+134/-54)
12 files modified
.pc/applied-patches (+0/-1)
.pc/dbus_include.patch/libqtf/CMakeLists.txt (+28/-0)
.pc/telepathy-farstream-0.4.patch/libqtf/CMakeLists.txt (+28/-0)
.pc/telepathy-farstream-0.4/libqtf/CMakeLists.txt (+0/-28)
debian/changelog (+30/-0)
debian/control (+5/-5)
debian/patches/dbus_include.patch (+14/-0)
debian/patches/series (+2/-1)
debian/patches/telepathy-farstream-0.4 (+0/-19)
debian/patches/telepathy-farstream-0.4.patch (+19/-0)
debian/rules (+7/-0)
libqtf/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/saucy/ktp-call-ui/0.6.3-1
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+180423@code.launchpad.net

Description of the change

Merged from debian unstable

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

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

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

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

Can you please investigate? Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1telepathy-farstream-0.4.patch
2dbus_include.patch
03
=== 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 @@
1telepathy-farstream-0.4
20
=== 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 @@
1# This is *A LOT* of dependencies to find one by one,
2# since gnome people like to include as many headers as possible
3# in their public headers instead of doing forward declarations.
4find_package(PkgConfig REQUIRED)
5pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream-0.4)
6pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
7
8include_directories(
9 ${CMAKE_CURRENT_BINARY_DIR}
10 ${TP_FARSTREAM_INCLUDE_DIRS}
11 ${FARSTREAM_INCLUDE_DIRS}
12 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
13)
14
15add_definitions(
16 # These prevent gstreamer from including libxml2 headers
17 -DGST_DISABLE_XML
18 -DGST_DISABLE_LOADSAVE
19)
20
21kde4_add_library(qtf STATIC qtf.cpp)
22
23target_link_libraries(qtf
24 ${QTGSTREAMER_LIBRARIES}
25 ${TP_FARSTREAM_LDFLAGS}
26 ${FARSTREAM_LDFLAGS}
27 ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
28)
029
=== 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 @@
1# This is *A LOT* of dependencies to find one by one,
2# since gnome people like to include as many headers as possible
3# in their public headers instead of doing forward declarations.
4find_package(PkgConfig REQUIRED)
5pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
6pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
7
8include_directories(
9 ${CMAKE_CURRENT_BINARY_DIR}
10 ${TP_FARSTREAM_INCLUDE_DIRS}
11 ${FARSTREAM_INCLUDE_DIRS}
12 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
13)
14
15add_definitions(
16 # These prevent gstreamer from including libxml2 headers
17 -DGST_DISABLE_XML
18 -DGST_DISABLE_LOADSAVE
19)
20
21kde4_add_library(qtf STATIC qtf.cpp)
22
23target_link_libraries(qtf
24 ${QTGSTREAMER_LIBRARIES}
25 ${TP_FARSTREAM_LDFLAGS}
26 ${FARSTREAM_LDFLAGS}
27 ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
28)
029
=== 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 @@
1# This is *A LOT* of dependencies to find one by one,
2# since gnome people like to include as many headers as possible
3# in their public headers instead of doing forward declarations.
4find_package(PkgConfig REQUIRED)
5pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
6pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
7
8include_directories(
9 ${CMAKE_CURRENT_BINARY_DIR}
10 ${TP_FARSTREAM_INCLUDE_DIRS}
11 ${FARSTREAM_INCLUDE_DIRS}
12 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
13)
14
15add_definitions(
16 # These prevent gstreamer from including libxml2 headers
17 -DGST_DISABLE_XML
18 -DGST_DISABLE_LOADSAVE
19)
20
21kde4_add_library(qtf STATIC qtf.cpp)
22
23target_link_libraries(qtf
24 ${QTGSTREAMER_LIBRARIES}
25 ${TP_FARSTREAM_LDFLAGS}
26 ${FARSTREAM_LDFLAGS}
27 ${TELEPATHY_QT4_FARSTREAM_LIBRARIES}
28)
290
=== 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 @@
1ktp-call-ui (0.6.3-1ubuntu1) saucy; urgency=low
2
3 * Merge from debian unstable. Remaining changes:
4 - add debian/patches/telepathy-farstream-0.4.patch
5 - build depend on libtelepathy-farstream-0.4-dev rather than
6 libtelepathy-farstream-dev
7
8 -- Jackson Doak <noskcaj@ubuntu.com> Fri, 16 Aug 2013 06:29:41 +1000
9
10ktp-call-ui (0.6.3-1) unstable; urgency=low
11
12 [ Diane Trout ]
13 * Imported Upstream version 0.6.2
14 * Bump ktp-common-internals dependency to 0.6.2
15 * Bump libtelepathy-qt4-dev dependency to 0.9.3
16 * Bump libfarstream-0.1-dev dependency to 0.1.2
17 * Add patch to link libqtf against d-bus.
18 * Update CMAKE_FLAGS to for header files in subdirectories.
19 * Set Uploaders to Diane Trout and Michał Zając
20 * Install ktp-dialout-ui
21 * Bump Standards-Version to 3.9.4. No changes needed.
22 * Update watch file as KDE-Telepathy is now in KDE stable.
23
24 [ Mark Purcell ]
25 * Imported Upstream version 0.6.3
26 * Add myself to Uploaders
27 * Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)
28
29 -- Mark Purcell <msp@debian.org> Sun, 11 Aug 2013 10:25:30 +1000
30
1ktp-call-ui (0.6.3-0ubuntu1) saucy; urgency=low31ktp-call-ui (0.6.3-0ubuntu1) saucy; urgency=low
232
3 * New upstream release (LP: #1208837)33 * New upstream release (LP: #1208837)
434
=== 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 @@
3Priority: optional3Priority: optional
4Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>4Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>5XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
6Uploaders: George Kiagiadakis <kiagiadakis.george@gmail.com>6Uploaders: Diane Trout <diane@ghic.org>, Michał Zając <quintasan@kubuntu.org>, Mark Purcell <msp@debian.org>
7Build-Depends: debhelper (>= 9),7Build-Depends: debhelper (>= 9),
8 pkg-kde-tools,8 pkg-kde-tools,
9 cmake,9 cmake,
10 kdelibs5-dev,10 kdelibs5-dev,
11 libtelepathy-qt4-dev (>= 0.9.1),11 libtelepathy-qt4-dev (>= 0.9.3),
12 libqtgstreamer-dev (>= 0.10.2),12 libqtgstreamer-dev (>= 0.10.2),
13 pkg-config,13 pkg-config,
14 libktpcommoninternalsprivate-dev (>= 0.6.3),14 libktpcommoninternalsprivate-dev (>= 0.6.3),
15 libtelepathy-farstream-0.4-dev (>= 0.4.0),15 libtelepathy-farstream-0.4-dev (>= 0.4.0),
16 libfarstream-0.1-dev (>= 0.1.1)16 libfarstream-0.1-dev (>= 0.1.2)
17Standards-Version: 3.9.317Standards-Version: 3.9.4
18Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-call-ui18Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-call-ui
19Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git19Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git
20Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git20Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git
@@ -22,7 +22,7 @@
22Package: kde-telepathy-call-ui22Package: kde-telepathy-call-ui
23Architecture: any23Architecture: any
24Depends: ${shlibs:Depends}, ${misc:Depends},24Depends: ${shlibs:Depends}, ${misc:Depends},
25 kde-telepathy-data (>= 0.4.0),25 kde-telepathy-data (>= 0.6.1),
26 gstreamer0.10-plugins-base,26 gstreamer0.10-plugins-base,
27 gstreamer0.10-plugins-good,27 gstreamer0.10-plugins-good,
28 gstreamer0.10-x,28 gstreamer0.10-x,
2929
=== 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 @@
1Author: Diane Trout <diane@ghic.org>
2Description: link qtf against d-bus to avoid a missing symbols error.
3Index: ktp-call-ui/libqtf/CMakeLists.txt
4===================================================================
5--- ktp-call-ui.orig/libqtf/CMakeLists.txt 2013-08-16 06:33:07.675498642 +1000
6+++ ktp-call-ui/libqtf/CMakeLists.txt 2013-08-16 06:33:07.671498606 +1000
7@@ -10,6 +10,7 @@
8 ${TP_FARSTREAM_INCLUDE_DIRS}
9 ${FARSTREAM_INCLUDE_DIRS}
10 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
11+ ${DBUS_INCLUDE_DIR}
12 )
13
14 add_definitions(
015
=== 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 @@
1telepathy-farstream-0.41telepathy-farstream-0.4.patch
2dbus_include.patch
23
=== 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 @@
1Description: Look for telepathy-farstream-0.4.pc instead of telepathy-farstream.pc
2 (in Ubuntu we have created a parallel-installable tp-farstream for the sake of
3 KDE packages)
4Author: Iain Lane <iain.lane@canonical.com>
5Forwarded: not-needed
6
7Index: b/libqtf/CMakeLists.txt
8===================================================================
9--- a/libqtf/CMakeLists.txt
10+++ b/libqtf/CMakeLists.txt
11@@ -2,7 +2,7 @@
12 # since gnome people like to include as many headers as possible
13 # in their public headers instead of doing forward declarations.
14 find_package(PkgConfig REQUIRED)
15-pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
16+pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream-0.4)
17 pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
18
19 include_directories(
200
=== 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 @@
1Description: Look for telepathy-farstream-0.4.pc instead of telepathy-farstream.pc
2 (in Ubuntu we have created a parallel-installable tp-farstream for the sake of
3 KDE packages)
4Author: Iain Lane <iain.lane@canonical.com>
5Forwarded: not-needed
6
7Index: ktp-call-ui/libqtf/CMakeLists.txt
8===================================================================
9--- ktp-call-ui.orig/libqtf/CMakeLists.txt 2013-08-16 06:33:02.175471361 +1000
10+++ ktp-call-ui/libqtf/CMakeLists.txt 2013-08-16 06:33:02.171471331 +1000
11@@ -2,7 +2,7 @@
12 # since gnome people like to include as many headers as possible
13 # in their public headers instead of doing forward declarations.
14 find_package(PkgConfig REQUIRED)
15-pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream)
16+pkg_check_modules(TP_FARSTREAM REQUIRED telepathy-farstream-0.4)
17 pkg_check_modules(FARSTREAM REQUIRED farstream-0.1)
18
19 include_directories(
020
=== 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 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3CMAKE_FLAGS := \
4 -DTP_FARSTREAM_INCLUDE_DIRS=/usr/include/telepathy-1.0 \
5 -DDBUS_INCLUDE_DIR=/usr/include/dbus-1.0
6
3%:7%:
4 dh $@ --parallel --with kde --dbg-package=kde-telepathy-call-ui-dbg --list-missing8 dh $@ --parallel --with kde --dbg-package=kde-telepathy-call-ui-dbg --list-missing
9
10override_dh_auto_configure:
11 dh_auto_configure -- $(CMAKE_FLAGS)
512
=== 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 @@
10 ${TP_FARSTREAM_INCLUDE_DIRS}10 ${TP_FARSTREAM_INCLUDE_DIRS}
11 ${FARSTREAM_INCLUDE_DIRS}11 ${FARSTREAM_INCLUDE_DIRS}
12 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}12 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
13 ${DBUS_INCLUDE_DIR}
13)14)
1415
15add_definitions(16add_definitions(

Subscribers

People subscribed via source and target branches

to all changes: