Merge lp:~attente/maliit/merge-wily-changelog into lp:~ubuntu-core-dev/maliit/maliit-framework-ubuntu

Proposed by William Hua on 2015-11-23
Status: Merged
Merged at revision: 50
Proposed branch: lp:~attente/maliit/merge-wily-changelog
Merge into: lp:~ubuntu-core-dev/maliit/maliit-framework-ubuntu
Diff against target: 46 lines (+29/-0)
1 file modified
debian/changelog (+29/-0)
To merge this branch: bzr merge lp:~attente/maliit/merge-wily-changelog
Reviewer Review Type Date Requested Status
Didier Roche 2015-11-23 Approve on 2015-11-27
Timo Jyrinki Approve on 2015-11-25
Review via email: mp+278353@code.launchpad.net

Commit message

Branch is missing debian/changelog entries due to being out-of-sync with archive. Merge the diff back in to update this branch.

Description of the change

Branch is missing debian/changelog entries due to being out-of-sync with archive. Merge the diff back in to update this branch.

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Thank you, makes sense (but I'm not a core-dev yet, someone else needs to sponsor this).

review: Approve
Timo Jyrinki (timo-jyrinki) wrote :

Or actually, this is an universe package so I was able to upload a fixed package but this packaging is for some reason under core-dev.

https://launchpad.net/ubuntu/+source/maliit-framework/0.99.1+git20151118+62bd54b-0ubuntu2

review: Approve
William Hua (attente) wrote :

Thanks, I hope someone can still merge this just so we have an up-to-date branch to avoid this problem in the future.

Didier Roche (didrocks) wrote :

And pushed to the branch then, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-11-23 09:10:53 +0000
3+++ debian/changelog 2015-11-23 18:17:37 +0000
4@@ -28,6 +28,8 @@
5 - Export GTK_IM_MODULE under Unity 8
6 * debian/patches/series:
7 * debian/patches/0008-qt5.3-fix.patch:
8+ * debian/patches/0014-fix-building-with-qt5.5.patch:
9+ * debian/patches/0015-fix-plugin-iid.patch:
10 - Removed, fixed upstream
11 * debian/patches/0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch:
12 - Added, install generated headers properly
13@@ -39,6 +41,33 @@
14
15 -- William Hua <william.hua@canonical.com> Wed, 18 Nov 2015 15:28:03 -0500
16
17+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu12) wily; urgency=medium
18+
19+ * Add 0015-fix-plugin-iid.patch to fix keyboard functionality with Qt 5.5,
20+ #ifdef to build also on Qt 5.4.
21+ (LP: #1474690)
22+
23+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 05 Oct 2015 12:41:54 +0000
24+
25+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu11~gcc5.1) wily; urgency=medium
26+
27+ * No-change test rebuild for g++5 ABI transition
28+
29+ -- Steve Langasek <steve.langasek@ubuntu.com> Wed, 15 Jul 2015 15:39:10 +0000
30+
31+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu10) wily; urgency=medium
32+
33+ * No-change rebuild against Qt 5.4.2.
34+
35+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 11 Jun 2015 21:28:58 +0300
36+
37+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu9) wily; urgency=medium
38+
39+ [ Michael Sheldon ]
40+ * 0014-fix-building-with-qt5.5.patch: Fix FTBFS with Qt 5.5 (LP: #1437182)
41+
42+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 04 Jun 2015 12:12:49 +0100
43+
44 maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu8) vivid; urgency=medium
45
46 [ William Hua ]

Subscribers

People subscribed via source and target branches