qtcreator-plugin-ubuntu

Merge lp:~timo-jyrinki/qtcreator-plugin-ubuntu/add_cordova_depends into lp:qtcreator-plugin-ubuntu

  1. add_cordova_depends
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 27
Merged at revision: 28
Proposed branch: lp:~timo-jyrinki/qtcreator-plugin-ubuntu/add_cordova_depends
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 43 lines (+8/-3)
2 files modified
debian/changelog (+4/-0)
debian/control (+4/-3)
To merge this branch: bzr merge lp:~timo-jyrinki/qtcreator-plugin-ubuntu/add_cordova_depends
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu SDK team Pending
Review via email: mp+184722@code.launchpad.net

Commit message

Add Cordova dependencies to the Cordova plugin (LP: #1209385)

Description of the change

Add Cordova dependencies to the Cordova plugin (LP: #1209385)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-saucy-armhf-ci/25

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtcreator-plugin-ubuntu-ci/25/rebuild

review: Approve (continuous-integration)

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-09-09 05:29:48 +0000
3+++ debian/changelog 2013-09-10 05:18:57 +0000
4@@ -1,7 +1,11 @@
5 qtcreator-plugin-ubuntu (2.7.2-0ubuntu2) UNRELEASED; urgency=low
6
7+ [ Zoltan Balogh ]
8 * Fix app id and the dbus session adress (LP: #1221414).
9
10+ [ Timo Jyrinki ]
11+ * Add Cordova dependencies to the Cordova plugin (LP: #1209385)
12+
13 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Mon, 09 Sep 2013 08:28:59 +0300
14
15 qtcreator-plugin-ubuntu (2.7.2-0ubuntu1) saucy; urgency=low
16
17=== modified file 'debian/control'
18--- debian/control 2013-09-06 11:30:03 +0000
19+++ debian/control 2013-09-10 05:18:57 +0000
20@@ -38,6 +38,7 @@
21 ubuntu-ui-toolkit-doc,
22 ubuntu-ui-toolkit-examples,
23 ${misc:Depends},
24+Recommends: ubuntu-sdk
25 Description: Ubuntu plugin for Qt Creator IDE
26 Qt Creator is a new, lightweight, cross-platform integrated development
27 environment (IDE) designed to make development with the Qt application
28@@ -65,12 +66,12 @@
29
30 Package: qtcreator-plugin-ubuntu-cordova
31 Architecture: any
32-Depends: qtcreator-plugin-ubuntu (= ${binary:Version}),
33+Depends: cordova-ubuntu-2.8,
34+ cordova-ubuntu-2.8-dev,
35+ qtcreator-plugin-ubuntu (= ${binary:Version}),
36 qtcreator-plugin-ubuntu-cordova-common,
37 ${misc:Depends},
38 Replaces: qtcreator-plugin-ubuntu (<= 2.7.1-0ubuntu9)
39-Recommends: cordova-ubuntu-2.8,
40- cordovamobilespec,
41 Description: Cordova Ubuntu plugin for Qt Creator IDE
42 Qt Creator is a new, lightweight, cross-platform integrated development
43 environment (IDE) designed to make development with the Qt application

Subscribers

People subscribed via source and target branches

to all changes: