Merge lp:~sil2100/indicator-appmenu/indicator-appmenu-qt5 into lp:indicator-appmenu/13.10

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 236
Merged at revision: 236
Proposed branch: lp:~sil2100/indicator-appmenu/indicator-appmenu-qt5
Merge into: lp:indicator-appmenu/13.10
Diff against target: 26 lines (+8/-0)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~sil2100/indicator-appmenu/indicator-appmenu-qt5
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+156017@code.launchpad.net

Commit message

We're adding Qt5 support to appmenu, let's pull that in case someone would install Qt5. It's safe, since the added packages don't depend on Qt5 directly - they Suggest it instead.

Description of the change

NOTE! There are a few merges that need to get in before this one can be accepted, be sure to check them before approving!

-> https://code.launchpad.net/~sil2100/appmenu-qt/appmenu-qt-multi/+merge/156002
-> https://code.launchpad.net/~sil2100/libdbusmenu-qt/libdbusmenu-qt-multi/+merge/156010
-> https://code.launchpad.net/~sil2100/libdbusmenu-qt/libdbusmenu-qt-inline-and-qt5/+merge/156015

- Problem:

We lack Qt5 appmenu support. We're adding that. We want to Recommend appmenu-qt5 to have it installed in case Qt5 would be installed by anyone.

- Fix:

We add it to Recommends:. This is safe, since appmenu-qt5 and libdbusmenu-qt5 are hacked not to Depend on Qt5. Instead they 'Suggest' on Qt5. This way, we can safely Recommend those packages and feel safe that Qt5 won't get installed when not needed.

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Needs fixing: just because this needs to wait for now... otherwise it's good :)

review: Needs Fixing
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Let's land this so we can make it build for daily release.

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 2013-02-20 09:41:54 +0000
3+++ debian/changelog 2013-03-28 16:17:22 +0000
4@@ -1,3 +1,10 @@
5+indicator-appmenu (13.01.0daily13.02.20-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/control:
8+ - We're recommending the installation of appmenu-qt5 now, which is safe
9+
10+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Thu, 28 Mar 2013 15:36:34 +0100
11+
12 indicator-appmenu (13.01.0daily13.02.20-0ubuntu1) raring; urgency=low
13
14 [ Mathieu Trudel-Lapierre ]
15
16=== modified file 'debian/control'
17--- debian/control 2013-02-19 17:08:57 +0000
18+++ debian/control 2013-03-28 16:17:22 +0000
19@@ -36,6 +36,7 @@
20 appmenu-gtk,
21 appmenu-gtk3,
22 appmenu-qt,
23+ appmenu-qt5,
24 Description: Indicator for application menus.
25 .
26 This package provides support for application menus.

Subscribers

People subscribed via source and target branches