diff -Nru ktp-text-ui-15.12.3/app/main.cpp ktp-text-ui-16.04.3/app/main.cpp
--- ktp-text-ui-15.12.3/app/main.cpp	2016-03-09 23:26:15.000000000 +0000
+++ ktp-text-ui-16.04.3/app/main.cpp	2016-07-02 16:13:27.000000000 +0000
@@ -51,6 +51,8 @@
     Tp::registerTypes();
     KTp::registerOtrTypes();
 
+    Tp::SharedPtr<TelepathyChatUi> app(new TelepathyChatUi(argc, argv));
+
     Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
     channelFactory->addCommonFeatures(Tp::Channel::FeatureCore);
 
@@ -64,7 +66,6 @@
 
     Tp::ClientRegistrarPtr registrar = Tp::ClientRegistrar::create(KTp::accountFactory(), KTp::connectionFactory(), channelFactory, KTp::contactFactory());
 
-    Tp::SharedPtr<TelepathyChatUi> app(new TelepathyChatUi(argc, argv));
     Tp::AbstractClientPtr handler = Tp::AbstractClientPtr(app);
     registrar->registerClient(handler, QLatin1String(KTP_TEXTUI_CLIENT_NAME));
 
diff -Nru ktp-text-ui-15.12.3/CMakeLists.txt ktp-text-ui-16.04.3/CMakeLists.txt
--- ktp-text-ui-15.12.3/CMakeLists.txt	2016-03-09 23:26:15.000000000 +0000
+++ ktp-text-ui-16.04.3/CMakeLists.txt	2016-07-02 16:13:27.000000000 +0000
@@ -3,8 +3,8 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 # KDE Application Version, managed by release script
-set(KDE_APPLICATIONS_VERSION_MAJOR "15")
-set(KDE_APPLICATIONS_VERSION_MINOR "12")
+set(KDE_APPLICATIONS_VERSION_MAJOR "16")
+set(KDE_APPLICATIONS_VERSION_MINOR "04")
 set(KDE_APPLICATIONS_VERSION_MICRO "3")
 set(KTP_TEXT_UI_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
@@ -28,7 +28,7 @@
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMSetupVersion)
 include(FeatureSummary)
 
diff -Nru ktp-text-ui-15.12.3/debian/changelog ktp-text-ui-16.04.3/debian/changelog
--- ktp-text-ui-15.12.3/debian/changelog	2016-04-14 23:12:23.000000000 +0000
+++ ktp-text-ui-16.04.3/debian/changelog	2016-09-30 04:37:32.000000000 +0000
@@ -1,11 +1,48 @@
+ktp-text-ui (4:16.04.3-0ubuntu1) yakkety; urgency=medium
+
+  [ Scarlett Clark ]
+  * New upstream release.
+  * Debian merge: No remaining changes. 
+  * Fix merge. 
+
+  [ Philip Muškovac ]
+  * Update the Vcs URLs now that the repositories are hosted on
+    Launchpad
+
+  [ Scarlett Clark ]
+  * New upstream bugfix release
+
+  [ Clive Johnston ]
+  * Overriding lintian error package-must-activate-ldconfig-trigger
+  * New upstream release (16.04.2)
+  * New upstream release (16.04.3)
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Fri, 30 Sep 2016 06:37:32 +0200
+
 ktp-text-ui (4:15.12.3-0ubuntu1) xenial; urgency=medium
 
   * New upstream bugfix release
-  * Add missing epoch libktp-dev. 
+  * Add missing epoch libktp-dev.
   * New upstream bugfix release
 
  -- Scarlett Clark <sgclark@kubuntu.org>  Thu, 14 Apr 2016 16:12:23 -0700
 
+ktp-text-ui (15.12.2-1~) UNRELEASED; urgency=medium
+
+  [ Maximiliano Curia ]
+  * New upstream release (15.12.2).
+
+  [ Scarlett Clark ]
+  * New upstream release
+
+ -- Scarlett Clark <sgclark@kubuntu.org>  Sun, 01 May 2016 20:35:44 -0700
+
+ktp-text-ui (15.12.1-2) experimental; urgency=medium
+
+  * Bump build dependencies.
+
+ -- Maximiliano Curia <maxy@debian.org>  Sat, 13 Feb 2016 09:04:32 +0100
+
 ktp-text-ui (4:15.12.1-1ubuntu1) xenial; urgency=medium
 
   * Merged with Debian
diff -Nru ktp-text-ui-15.12.3/debian/control ktp-text-ui-16.04.3/debian/control
--- ktp-text-ui-15.12.3/debian/control	2016-04-14 23:12:23.000000000 +0000
+++ ktp-text-ui-16.04.3/debian/control	2016-09-30 04:37:32.000000000 +0000
@@ -8,28 +8,28 @@
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                dh-linktree,
-               extra-cmake-modules (>= 1.3.0~),
-               kio-dev,
+               extra-cmake-modules (>= 5.24.0~),
+               kio-dev (>= 5.24.0~),
                libjs-jquery,
-               libkf5archive-dev,
-               libkf5dbusaddons-dev,
-               libkf5emoticons-dev (>= 5.16-2),
-               libkf5i18n-dev,
-               libkf5iconthemes-dev,
-               libkf5itemviews-dev,
-               libkf5kcmutils-dev,
-               libkf5notifications-dev,
-               libkf5notifyconfig-dev,
-               libkf5people-dev,
-               libkf5service-dev,
-               libkf5sonnet-dev,
-               libkf5textwidgets-dev,
-               libkf5wallet-dev,
-               libkf5webkit-dev,
-               libkf5widgetsaddons-dev,
-               libkf5windowsystem-dev,
-               libkf5xmlgui-dev,
-               libktp-dev (>= 4:15.12),
+               libkf5archive-dev (>= 5.24.0~),
+               libkf5dbusaddons-dev (>= 5.24.0~),
+               libkf5emoticons-dev (>= 5.24.0~),
+               libkf5i18n-dev (>= 5.24.0~),
+               libkf5iconthemes-dev (>= 5.24.0~),
+               libkf5itemviews-dev (>= 5.24.0~),
+               libkf5kcmutils-dev (>= 5.24.0~),
+               libkf5notifications-dev (>= 5.24.0~),
+               libkf5notifyconfig-dev (>= 5.24.0~),
+               libkf5people-dev (>= 5.24.0~),
+               libkf5service-dev (>= 5.24.0~),
+               libkf5sonnet-dev (>= 5.24.0~),
+               libkf5textwidgets-dev (>= 5.24.0~),
+               libkf5wallet-dev (>= 5.24.0~),
+               libkf5webkit-dev (>= 5.24.0~),
+               libkf5widgetsaddons-dev (>= 5.24.0~),
+               libkf5windowsystem-dev (>= 5.24.0~),
+               libkf5xmlgui-dev (>= 5.24.0~),
+               libktp-dev (>= 4:16.04.3~),
                libqjson-dev,
                libqt5webkit5-dev (>= 5.4),
                libqtwebkit-dev,
@@ -37,11 +37,11 @@
                libtelepathy-logger-qt-dev (>= 0.8.0),
                libtelepathy-qt5-dev (>= 0.9.5),
                pkg-kde-tools (>= 0.9),
-               qtbase5-dev
+               qtbase5-dev (>= 5.6.1~)
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-text-ui
-Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/ktp-text-ui.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/ktp-text-ui.git
+Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ktp-text-ui
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ktp-text-ui
 
 Package: kde-telepathy-text-ui
 Architecture: any
diff -Nru ktp-text-ui-15.12.3/debian/gbp.conf ktp-text-ui-16.04.3/debian/gbp.conf
--- ktp-text-ui-15.12.3/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ ktp-text-ui-16.04.3/debian/gbp.conf	2016-09-30 04:37:32.000000000 +0000
@@ -0,0 +1,2 @@
+[import-orig]
+merge = True
diff -Nru ktp-text-ui-15.12.3/debian/kde-telepathy-text-ui.lintian-overrides ktp-text-ui-16.04.3/debian/kde-telepathy-text-ui.lintian-overrides
--- ktp-text-ui-15.12.3/debian/kde-telepathy-text-ui.lintian-overrides	2016-04-14 23:12:23.000000000 +0000
+++ ktp-text-ui-16.04.3/debian/kde-telepathy-text-ui.lintian-overrides	2016-09-30 04:37:32.000000000 +0000
@@ -5,3 +5,4 @@
 kde-telepathy-text-ui: postinst-must-call-ldconfig usr/lib/*/libktpimagesharer.so
 kde-telepathy-text-ui: shlib-without-versioned-soname usr/lib/*/libktpchat.so libktpchat.so
 kde-telepathy-text-ui: shlib-without-versioned-soname usr/lib/*/libktpimagesharer.so libktpimagesharer.so
+kde-telepathy-text-ui: package-must-activate-ldconfig-trigger usr/lib/*/libktpimagesharer.so
diff -Nru ktp-text-ui-15.12.3/debian/rules ktp-text-ui-16.04.3/debian/rules
--- ktp-text-ui-15.12.3/debian/rules	2016-04-14 23:12:23.000000000 +0000
+++ ktp-text-ui-16.04.3/debian/rules	2016-09-30 04:37:32.000000000 +0000
@@ -6,7 +6,7 @@
 	$(overridden_command) --destdir=debian/tmp
 
 override_dh_strip:
-	$(overridden_command) --ddeb-migration='kde-telepathy-text-ui-dbg (<= 15.12.1-1~~)'
+	$(overridden_command) --dbgsym-migration='kde-telepathy-text-ui-dbg (<= 15.12.1-1~~)'
 
 override_dh_install:
 	$(overridden_command) --fail-missing
diff -Nru ktp-text-ui-15.12.3/debian/upstream/metadata ktp-text-ui-16.04.3/debian/upstream/metadata
--- ktp-text-ui-15.12.3/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ ktp-text-ui-16.04.3/debian/upstream/metadata	2016-09-30 04:37:32.000000000 +0000
@@ -0,0 +1,7 @@
+Name: ktp-text-ui
+Changelog: https://quickgit.kde.org/?p=ktp-text-ui.git&a=log
+Contact: kde-devel@kde.org
+Donation: https://www.kde.org/community/donations/index.php
+Repository: https://anongit.kde.org/ktp-text-ui.git
+Repository-Browse: https://quickgit.kde.org/?p=ktp-text-ui.git
+Security-Contact: security@kde.org
diff -Nru ktp-text-ui-15.12.3/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake ktp-text-ui-16.04.3/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake
--- ktp-text-ui-15.12.3/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake	2016-03-09 23:26:15.000000000 +0000
+++ ktp-text-ui-16.04.3/filters/emoticons/ktptextui_message_filter_emoticons.desktop.cmake	2016-07-02 16:13:27.000000000 +0000
@@ -76,7 +76,7 @@
 Comment[pl]=Pokaż emotikony (buźki) wewnątrz okna rozmowy
 Comment[pt]=Mostrar os ícones emotivos nas conversas
 Comment[pt_BR]=Mostra emoticons (carinhas) dentro da conversa
-Comment[ro]=Arată emoticoni (fețe zîmbitoare) în interiorul discuției
+Comment[ro]=Arată emoticoni (fețe zâmbitoare) în interiorul discuției
 Comment[ru]=Показывать смайлики в чате
 Comment[sk]=Zobraziť emotikony (smajlíkov) v rozhovore
 Comment[sl]=Pokaži izrazne ikone (obraze smeškov) znotraj klepeta
diff -Nru ktp-text-ui-15.12.3/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake ktp-text-ui-16.04.3/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake
--- ktp-text-ui-15.12.3/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake	2016-03-09 23:26:15.000000000 +0000
+++ ktp-text-ui-16.04.3/filters/youtube/ktptextui_message_filter_youtube.desktop.cmake	2016-07-02 16:13:27.000000000 +0000
@@ -45,7 +45,7 @@
 Name[zh_TW]=YouTube 預覽
 Comment=If any messages contains a link to a YouTube video, it will embed a preview in the chat
 Comment[ar]=إن احتوت أيّ رسالة وصلة إلى فيديو يوتيوب، ستُضمّن معاينة في الدّردشة.
-Comment[ast]=Si cualesquier mensaxe contién un enllaz a un videu de Youtube, empotraráse una previsualización na charra
+Comment[ast]=Si cualesquier mensaxe contién un enllaz a un videu de Youtube, incrustaráse una previsualización na charra
 Comment[bs]=Ako poruka sadrži vezu na YouTube video, oma će se ugraditi u pregled ćaskanja
 Comment[ca]=Si qualsevol missatge conté un enllaç a un vídeo de YouTube, s'incrustarà una vista prèvia en el xat
 Comment[ca@valencia]=Si qualsevol missatge conté un enllaç a un vídeo de YouTube, s'incrustarà una vista prèvia en el xat