qtcreator-plugin-ubuntu

Merge lp:~pitti/qtcreator-plugin-ubuntu/dep-fix into lp:qtcreator-plugin-ubuntu

  1. dep-fix
  2. Merge into trunk
Proposed by Martin Pitt
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 450
Merge reported by: Zoltan Balogh
Merged at revision: not available
Proposed branch: lp:~pitti/qtcreator-plugin-ubuntu/dep-fix
Merge into: lp:qtcreator-plugin-ubuntu
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:~pitti/qtcreator-plugin-ubuntu/dep-fix
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+291748@code.launchpad.net

Description of the change

This is the dependency fix that I just uploaded to Ubuntu. Please pull this branch into trunk to get accurate history and tags (i. e. don't merge). I can't push myself as ~ubuntu-core-dev cannot write this branch.

To post a comment you must log in.

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 2016-03-23 09:24:34 +0000
3+++ debian/changelog 2016-04-13 12:45:38 +0000
4@@ -1,3 +1,10 @@
5+qtcreator-plugin-ubuntu (3.5.0+16.04.20160323-0ubuntu2) xenial; urgency=medium
6+
7+ * Lower ubuntu-emulator Recommends: to a Suggests:, as ubuntu-emulator is in
8+ multiverse.
9+
10+ -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 13 Apr 2016 14:43:09 +0200
11+
12 qtcreator-plugin-ubuntu (3.5.0+16.04.20160323-0ubuntu1) xenial; urgency=medium
13
14 [ Zoltán Balogh ]
15
16=== modified file 'debian/control'
17--- debian/control 2015-11-16 08:53:06 +0000
18+++ debian/control 2016-04-13 12:45:38 +0000
19@@ -64,6 +64,7 @@
20 qtconnectivity5-examples,
21 qtsystems5-examples,
22 qtcreator-plugin-go,
23+Suggests:
24 ubuntu-emulator
25 Description: Ubuntu plugin for Qt Creator IDE
26 Qt Creator is a lightweight, cross-platform integrated development

Subscribers

People subscribed via source and target branches

to all changes: