Merge lp:~ari-tczew/ubuntu/trusty/telepathy-qt/merge into lp:ubuntu/trusty-proposed/telepathy-qt

[Artur Rona]

[Dmitry Shachnev (mitya57)]

Thanks for your work. The remaining changes are:

 - debian/control, debian/patches/use-telepathy-farstream-0.4:
    + Use 'telepathy-farstream-0.4' instead of 'telepathy-farstream'.
      This package is (as of now) incompatible with the 0.6 series,
      so it needs to be updated to use the split 0.4 series packages.

Debian now has telepathy-farstream 0.6, and telepathy-qt seems to build fine against it. Do you know any specific problems wrt compatibility with 0.6? If yes, these at least should be reported to Debian (or upstream) bug tracker.

  - debian/libtelepathy-qt4-2.symbols: Update.

The symbols are (functionally) equal, update not needed.

In other words, unless you know any specific incompatibility problems, I would prefer to sync this package.

review: Needs Information

[Dmitry Shachnev (mitya57)]

Adding Michał to reviewers as he might know more about the situation.

[Michał Zając (quintasan)]

I do not know about any breakage between telepathy-qt and telepathy-farstream > 0.6. I'll try poking upstream to get some info about potential issues

[Dmitry Shachnev (mitya57)]

According to Iain, that change is needed because telepathy-qt and telepathy-farstream use incompatible gstreamer codebases. I have notified Debian maintainer (Diane) about that issue, and uploaded the merge to Trusty.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-31 10:30:51 +0000
+++ debian/changelog	2014-02-02 20:21:04 +0000
@@ -1,3 +1,71 @@
+telepathy-qt (0.9.3-3ubuntu1) trusty; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control, debian/patches/use-telepathy-farstream-0.4:
+      + Use 'telepathy-farstream-0.4' instead of 'telepathy-farstream'.
+        This package is (as of now) incompatible with the 0.6 series,
+        so it needs to be updated to use the split 0.4 series packages.
+    - debian/libtelepathy-qt4-2.symbols: Update.
+  * Dropped following changes:
+    - debian/patches/create-moc-command, fixed in Debian.
+
+ -- Artur Rona <[e-mail]>  Sun, 02 Feb 2014 19:18:01 +0100
+
+telepathy-qt (0.9.3-3) unstable; urgency=low
+
+  * Remove version requirement from pkg-config dependency (Closes: #734489)
+  * Update Standards-Version to 3.9.5. No Changes needed.
+  * Update debian/libtelepathy-qt4-2.symbols for 0.9.3 symbols.
+  * Explicitly use pkg-kde-tools for its symbol helper utilities.
+  * Explicitly force build type RelWithDebInfo
+
+ -- Diane Trout <[e-mail]>  Mon, 20 Jan 2014 14:47:29 -0800
+
+telepathy-qt (0.9.3-2) unstable; urgency=low
+
+  * Add fix_storing_avatars.patch. Fixes issue storing avatars
+    multiple times.
+  * Remove python compiled byte-code during debian auto_clean target.
+  * Add create_moc_command.patch to work around a change in a recent
+    cmake macro. (Closes: #728675)
+
+ -- Diane Trout <[e-mail]>  Wed, 27 Nov 2013 08:49:05 -0800
+
+telepathy-qt (0.9.3-1) unstable; urgency=low
+
+  * Team upload.
+
+  [ Diane Trout ]
+  * New upstream release.
+  * Bump libfarstream-0.1-dev, libtelepathy-farstream-dev,
+         libtelepathy-glib-dev dependencies.
+  * Remove fix_ftbfs_gcc47.patch applied upstream.
+  * Update libtelepathy-qt4-2.symbols.
+  * Remove git-buildpackage directory configuration options.
+  * Remove uneeded shlib:Depends from libtelepathy-qt4-dev control .
+  * Refresh patches.
+  * Add patch link-against-gobject.patch to provide g_object symbols
+    used by libtelepathy-qt4-farstream.
+  * Add myself to Uploaders.
+  * Update Vcs-* fields to canonical URIs.
+  * Update Standards-Version: 3.9.4. No changes needed.
+  * Add Multi-Arch: same to libtelepathy-qt4-dbg.
+
+  [ Michał Zając ]
+  * Drop fvisibility-inlines-hidden.patch - went upstream
+  * Change the Maintainer, ACKed by Simon McVittie:
+    - Change the Maintainers field to the KDE extras team.
+    - Update the Uploaders.
+  * Update symbols file
+  * Updated Vcs-* fields
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Remove upstream stuff from the repo. We are going to keep only debian/ on
+    it.
+  * Update symbols file with current amd64 build.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Fri, 05 Jul 2013 17:48:44 -0300
+
 telepathy-qt (0.9.3-0ubuntu7) trusty; urgency=medium
 
   * debian/patches/create-moc-command: Fix build with recent cmake.

=== modified file 'debian/control'
--- debian/control	2013-01-09 12:54:01 +0000
+++ debian/control	2014-02-02 20:21:04 +0000
@@ -2,24 +2,22 @@
 Section: libs
 Priority: optional
 Maintainer: Kubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Debian Telepathy maintainers <[e-mail]>
-Uploaders: Simon McVittie <[e-mail]>,
-           George Goldberg <[e-mail]>,
-           Jonny Lamb <[e-mail]>,
-           Adam Conrad <[e-mail]>,
-           George Kiagiadakis <[e-mail]>
+XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]>
+Uploaders: Michał Zając <[e-mail]>,
+           Diane Trout <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
+               pkg-kde-tools (>= 0.12),
                cmake,
                doxygen,
                graphviz,
                libgstreamer0.10-dev,
                libgstreamer-plugins-base0.10-dev,
                libqt4-dev (>= 4.6.0),
-               libfarstream-0.1-dev (>= 0.1.0),
+               libfarstream-0.1-dev (>= 0.1.2),
                libtelepathy-farstream-0.4-dev (>= 0.2.2),
-               libtelepathy-glib-dev (>= 0.17.5),
-               pkg-config (>= 0.21),
+               libtelepathy-glib-dev (>= 0.20.1),
+               pkg-config,
                python (>= 2.6),
                python-dbus,
                python-dev,
@@ -27,9 +25,9 @@
 # * python-dbus and python-gobject can safely be removed if you don't care
 #   about running the regression tests
 # * doxygen and graphviz should be Build-Depends-Indep if #478524 is fixed
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-qt.git
-Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-qt.git
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git
 Homepage: http://telepathy.freedesktop.org/wiki/
 
 Package: libtelepathy-qt4-2
@@ -71,7 +69,6 @@
          libtelepathy-qt4-farstream2 (= ${binary:Version}),
          libtelepathy-farstream-0.4-dev,
          pkg-config (>= 0.21),
-         ${shlibs:Depends},
          ${misc:Depends}
 Suggests: libtelepathy-qt4-doc
 Description: Qt 4 Telepathy library (headers and static library)
@@ -85,6 +82,7 @@
 
 Package: libtelepathy-qt4-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: libtelepathy-qt4-2 (= ${binary:Version}),

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2012-06-04 14:33:00 +0000
+++ debian/gbp.conf	2014-02-02 20:21:04 +0000
@@ -2,7 +2,3 @@
 debian-branch = debian
 upstream-branch = upstream
 pristine-tar = True
-
-[git-buildpackage]
-tarball-dir = ../tarballs/
-export-dir = ../build-area/

=== removed file 'debian/patches/create-moc-command'
--- debian/patches/create-moc-command	2013-12-31 10:30:51 +0000
+++ debian/patches/create-moc-command	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-Author: David Edmundson <[e-mail]>
-Description: Recent cmake has changed the argument count to
- qt4_create_moc_command, we need to adjust accordingly.
- Reviewed-by: Dario Freddi <[e-mail]>
-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)

=== added file 'debian/patches/create_moc_command.patch'
--- debian/patches/create_moc_command.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/create_moc_command.patch	2014-02-02 20:21:04 +0000
@@ -0,0 +1,28 @@
+Author: David Edmundson <[e-mail]>
+Description: Recent cmake has changed the argument count to
+ qt4_create_moc_command, we need to adjust accordingly.
+ Reviewed-by: Dario Freddi <[e-mail]>
+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)

=== added file 'debian/patches/fix_storing_avatars.patch'
--- debian/patches/fix_storing_avatars.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_storing_avatars.patch	2014-02-02 20:21:04 +0000
@@ -0,0 +1,55 @@
+Author: George Kiagiadakis <[e-mail]>
+Description: Fix storing avatars, so that they are not stored millions of times each
+ The original problem lies in the fact that QFile::rename() does not
+ overwrite existing files. Therefore it fails and the temporary file
+ stays on the filesystem together with the already existing avatar
+ file. Checking if the file exists before renaming solves this
+ partially, but the problem is that this operation is not atomic. There
+ can be many processes using tp-qt, fetching avatars at the same time
+ from the server, and in this case we can still have a problem
+ there. The final solution is to ignore a new avatar that has the same
+ token as an avatar that is already on the filesystem. According to the
+ spec, different avatars have different tokens, so if an avatar
+ changes, the token changes as well.
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47647
+Origin: upstream, http://cgit.freedesktop.org/telepathy/telepathy-qt4/commit/?id=8da9f7069929893bcee64dab22101134752fe618 
+--- a/TelepathyQt/contact-manager.cpp
++++ b/TelepathyQt/contact-manager.cpp
+@@ -1341,17 +1341,27 @@
+         debug() << "Filename:" << avatarFileName;
+         debug() << "MimeType:" << mimeType;
+ 
+-        QTemporaryFile mimeTypeFile(mimeTypeFileName);
+-        mimeTypeFile.open();
+-        mimeTypeFile.write(mimeType.toLatin1());
+-        mimeTypeFile.setAutoRemove(false);
+-        mimeTypeFile.rename(mimeTypeFileName);
++	if (!QFile::exists(mimeTypeFileName)) {
++	  QTemporaryFile mimeTypeFile(mimeTypeFileName);
++	  if (mimeTypeFile.open()) {
++	    mimeTypeFile.write(mimeType.toLatin1());
++	    mimeTypeFile.setAutoRemove(false);
++	    if (!mimeTypeFile.rename(mimeTypeFileName)) {
++	      mimeTypeFile.remove();
++	    }
++	  }
++	}
+ 
+-        QTemporaryFile avatarFile(avatarFileName);
+-        avatarFile.open();
+-        avatarFile.write(data);
+-        avatarFile.setAutoRemove(false);
+-        avatarFile.rename(avatarFileName);
++	if (!QFile::exists(avatarFileName)) {
++	  QTemporaryFile avatarFile(avatarFileName);
++	  if (avatarFile.open()) {
++	    avatarFile.write(data);
++	    avatarFile.setAutoRemove(false);
++	    if (!avatarFile.rename(avatarFileName)) {
++	      avatarFile.remove();
++	    }
++	  }
++	}    
+     }
+ 
+     ContactPtr contact = lookupContactByHandle(handle);

=== added file 'debian/patches/link-against-gobject.patch'
--- debian/patches/link-against-gobject.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/link-against-gobject.patch	2014-02-02 20:21:04 +0000
@@ -0,0 +1,13 @@
+Description: link aginst gobject for symbols used by telepathy-qt?-farstream
+Author: Diane Trout <[e-mail]>
+
+--- a/TelepathyQt/Farstream/CMakeLists.txt
++++ b/TelepathyQt/Farstream/CMakeLists.txt
+@@ -43,6 +43,7 @@
+         ${QT_QTCORE_LIBRARY}
+         ${TELEPATHY_FARSTREAM_LIBRARIES}
+         ${TELEPATHY_GLIB_LIBRARIES}
++        ${GOBJECT_LIBRARIES}
+         telepathy-qt${QT_VERSION_MAJOR}
+         ${TP_QT_LIBRARY_LINKER_FLAGS})
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-31 10:30:51 +0000
+++ debian/patches/series	2014-02-02 20:21:04 +0000
@@ -1,2 +1,4 @@
+fix_storing_avatars.patch
+link-against-gobject.patch
+create_moc_command.patch
 use-telepathy-farstream-0.4
-create-moc-command

=== modified file 'debian/rules'
--- debian/rules	2012-06-17 11:08:30 +0000
+++ debian/rules	2014-02-02 20:21:04 +0000
@@ -3,11 +3,12 @@
 include /usr/share/dpkg/architecture.mk
 
 %:
-	dh $@ --parallel
+	dh $@ --with pkgkde_symbolshelper --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DDISABLE_WERROR=ON -DHAVE_DOT=YES \
-	                     -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+	                     -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
+	                     -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_build:
@@ -29,3 +30,7 @@
 	dh_installdocs -a --link-doc=libtelepathy-qt4-2
 	dh_installdocs -i
 	rm -f debian/libtelepathy-qt4-doc/usr/share/doc/libtelepathy-qt4-doc/html/jquery.js
+
+override_dh_auto_clean:
+	dh_auto_clean
+	find . -name '*.pyc' -exec rm {} \;