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

[William Hua]

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

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

[Timo Jyrinki (timo-jyrinki)]

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

review: Approve

[Timo Jyrinki (timo-jyrinki)]

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)]

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)]

And pushed to the branch then, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-23 09:10:53 +0000
+++ debian/changelog	2015-11-23 18:17:37 +0000
@@ -28,6 +28,8 @@
     - Export GTK_IM_MODULE under Unity 8
   * debian/patches/series:
   * debian/patches/0008-qt5.3-fix.patch:
+  * debian/patches/0014-fix-building-with-qt5.5.patch:
+  * debian/patches/0015-fix-plugin-iid.patch:
     - Removed, fixed upstream
   * debian/patches/0014-revert-6e2f8b4253f219688d31002aebf010eeabf0079b.patch:
     - Added, install generated headers properly
@@ -39,6 +41,33 @@
 
  -- William Hua <[e-mail]>  Wed, 18 Nov 2015 15:28:03 -0500
 
+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu12) wily; urgency=medium
+
+  * Add 0015-fix-plugin-iid.patch to fix keyboard functionality with Qt 5.5, 
+    #ifdef to build also on Qt 5.4.
+    (LP: #1474690)
+
+ -- Timo Jyrinki <[e-mail]>  Mon, 05 Oct 2015 12:41:54 +0000
+
+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu11~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <[e-mail]>  Wed, 15 Jul 2015 15:39:10 +0000
+
+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu10) wily; urgency=medium
+
+  * No-change rebuild against Qt 5.4.2.
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 11 Jun 2015 21:28:58 +0300
+
+maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu9) wily; urgency=medium
+
+  [ Michael Sheldon ]
+  * 0014-fix-building-with-qt5.5.patch: Fix FTBFS with Qt 5.5 (LP: #1437182)
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 04 Jun 2015 12:12:49 +0100
+
 maliit-framework (0.99.0+git20130923+17fdf86-0ubuntu8) vivid; urgency=medium
 
   [ William Hua ]