qtcreator-plugin-ubuntu

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

  1. add_apache_files_to_debian_copyright
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 14
Merged at revision: 13
Proposed branch: lp://staging/~timo-jyrinki/qtcreator-plugin-ubuntu/add_apache_files_to_debian_copyright
Merge into: lp://staging/qtcreator-plugin-ubuntu
Diff against target: 55 lines (+30/-0)
2 files modified
debian/control (+2/-0)
debian/copyright (+28/-0)
To merge this branch: bzr merge lp://staging/~timo-jyrinki/qtcreator-plugin-ubuntu/add_apache_files_to_debian_copyright
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+181232@code.staging.launchpad.net

Commit message

Add Apache Foundation files to debian/copyright, add conflicts for old Qt Creator versions.

Description of the change

Add Apache Foundation files to debian/copyright, add conflicts for old Qt Creator versions.

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Daniel Holbach (dholbach) wrote :

Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: