webbrowser-app

Merge lp:~sil2100/webbrowser-app/missing_replaces into lp:webbrowser-app

  1. missing_replaces
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 256
Merged at revision: 255
Proposed branch: lp:~sil2100/webbrowser-app/missing_replaces
Merge into: lp:webbrowser-app
Diff against target: 17 lines (+5/-2)
1 file modified
debian/control (+5/-2)
To merge this branch: bzr merge lp:~sil2100/webbrowser-app/missing_replaces
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher Approve
Ubuntu Phablet Team Pending
Review via email: mp+177768@code.launchpad.net

Commit message

Missing Replaces in webbrowser-app for qtdeclarative5-ubuntu-ui-extras-browser-plugin, fixed the replaces for webbrowser-app-assets

Description of the change

Missing Replaces in webbrowser-app for qtdeclarative5-ubuntu-ui-extras-browser-plugin

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

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/135
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1738
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1738/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1477

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/252/rebuild

review: Approve (continuous-integration)
lp:~sil2100/webbrowser-app/missing_replaces updated
255. By Łukasz Zemczak

Add breaks

256. By Łukasz Zemczak

Fix the other breaks/replaces

Revision history for this message
Sebastien Bacher (seb128) wrote :

great

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1741
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1741/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1479

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/253/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-07-30 11:46:06 +0000
+++ debian/control 2013-07-31 09:53:23 +0000
@@ -34,8 +34,11 @@
34 qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),34 qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
35 qtdeclarative5-ubuntu-ui-toolkit-plugin,35 qtdeclarative5-ubuntu-ui-toolkit-plugin,
36 qtdeclarative5-window-plugin,36 qtdeclarative5-window-plugin,
37Replaces: webbrowser-app-assets (<< 0.22)37Replaces: webbrowser-app-assets,
38Conflicts: webbrowser-app-assets (<< 0.22)38 qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),
39Conflicts: webbrowser-app-assets
40Provides: webbrowser-app-assets
41Breaks: qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22)
39Description: Ubuntu web browser42Description: Ubuntu web browser
40 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering43 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
41 engine and using the Ubuntu UI components.44 engine and using the Ubuntu UI components.

Subscribers

People subscribed via source and target branches

to status/vote changes: