Merge ~panfaust/kubuntu-packaging/+git/bluez-qt:work2 into ~kubuntu-packagers/kubuntu-packaging/+git/bluez-qt:kubuntu_yakkety_archive

Proposed by Jose Manuel Santamaria Lema on 2016-09-13
Status: Merged
Merged at revision: e7910753545e8c7d9a3c0383a7b8c02eea76e796
Proposed branch: ~panfaust/kubuntu-packaging/+git/bluez-qt:work2
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/bluez-qt:kubuntu_yakkety_archive
Diff against target: 30 lines (+5/-5)
2 files modified
debian/changelog (+4/-4)
debian/libkf5bluezqt6.symbols (+1/-1)
Reviewer Review Type Date Requested Status
Rik Mills 2016-09-13 Approve on 2016-09-13
Review via email: mp+305666@code.launchpad.net

Description of the Change

Sync with Yakkety archive. Someone already uploaded a fixed version of bluez-qt, so just import the change from the archive.

To post a comment you must log in.
Rik Mills (rikmills) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index b90e4f2..5e219f8 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,9 +1,9 @@
6-bluez-qt (5.24.0-0ubuntu2) UNRELEASED; urgency=medium
7+bluez-qt (5.24.0-0ubuntu2) yakkety; urgency=medium
8
9- * Make leaked symbol from QByteArray optional, this avoids build
10- failures with gcc 6.
11+ * Drop non-ABI-relevant symbol from the symbols file for compatibility
12+ with latest qtbase-opensource-src package.
13
14- -- José Manuel Santamaría Lema <panfaust@gmail.com> Thu, 11 Aug 2016 16:36:13 +0200
15+ -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 30 Aug 2016 10:57:56 -0700
16
17 bluez-qt (5.24.0-0ubuntu1) yakkety; urgency=medium
18
19diff --git a/debian/libkf5bluezqt6.symbols b/debian/libkf5bluezqt6.symbols
20index 94c3ec7..9d57559 100644
21--- a/debian/libkf5bluezqt6.symbols
22+++ b/debian/libkf5bluezqt6.symbols
23@@ -1,6 +1,6 @@
24 # SymbolsHelper-Confirmed: 5.24.0 amd64 i386
25 libKF5BluezQt.so.6 libkf5bluezqt6 #MINVER#
26- (optional=gccinternal)_ZN10QByteArray7reserveEi@Base 5.24.0
27+ (optional)_ZN10QByteArray7reserveEi@Base 5.24.0
28 _ZN7BluezQt11MediaPlayer10setShuffleENS0_7ShuffleE@Base 5.13.0
29 _ZN7BluezQt11MediaPlayer11fastForwardEv@Base 5.13.0
30 _ZN7BluezQt11MediaPlayer11nameChangedERK7QString@Base 5.13.0

Subscribers

People subscribed via source and target branches