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

[Łukasz Zemczak]

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

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

[PS Jenkins bot (ps-jenkins)]

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]

255. By Łukasz Zemczak on 2013-07-31

Add breaks

256. By Łukasz Zemczak on 2013-07-31

Fix the other breaks/replaces

[Sebastien Bacher (seb128)]

great

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

=== 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 @@
          qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-window-plugin,
-Replaces: webbrowser-app-assets (<< 0.22)
-Conflicts: webbrowser-app-assets (<< 0.22)
+Replaces: webbrowser-app-assets,
+          qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22),
+Conflicts: webbrowser-app-assets
+Provides: webbrowser-app-assets
+Breaks: qtdeclarative5-ubuntu-ui-extras-browser-plugin (<< 0.22)
 Description: Ubuntu web browser
  A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
  engine and using the Ubuntu UI components.