webbrowser-app

Merge lp:~osomon/webbrowser-app/package-deps-conflict into lp:webbrowser-app

  1. package-deps-conflict
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 252
Merged at revision: 251
Proposed branch: lp:~osomon/webbrowser-app/package-deps-conflict
Merge into: lp:webbrowser-app
Diff against target: 27 lines (+9/-0)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/package-deps-conflict
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Łukasz Zemczak Approve
Review via email: mp+177532@code.launchpad.net

Commit message

Add missing Replaces and Conflicts fields to handle gracefully upgrades after packages were re-organized.

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

PASSED: Continuous integration, rev:249
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1691
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1691/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1436

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

review: Approve (continuous-integration)
lp:~osomon/webbrowser-app/package-deps-conflict updated
250. By Olivier Tilloy

Fix a typo.

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

PASSED: Continuous integration, rev:250
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/240/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1440

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

review: Approve (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

This looks ok, but I guess maybe a stronger dependency would be better? Like Conflicts instead of Breaks? Maybe we could also add a Provides: webbrowser-app-assets, but this is not necessary I guess.

review: Needs Fixing
Revision history for this message
Olivier Tilloy (osomon) wrote :

I’m not a packaging expert, I simply followed the recommendations at http://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces.

I’m happy to implement whatever suggestions you have.

lp:~osomon/webbrowser-app/package-deps-conflict updated
251. By Olivier Tilloy

Use Conflicts instead of Breaks, per Łukasz’ recommendation.

252. By Olivier Tilloy

Updated changelog entry.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looking better now, we can tweak it later on as well. For now at least we resolve conflicts.

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

PASSED: Continuous integration, rev:251
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/241/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1700
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1700/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1445

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/241/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-07-29 08:17:04 +0000
3+++ debian/changelog 2013-07-30 11:52:27 +0000
4@@ -1,3 +1,10 @@
5+webbrowser-app (0.22) UNRELEASED; urgency=low
6+
7+ * debian/control: add missing Replaces and Conflicts fields to handle
8+ gracefully upgrades after packages were re-organized.
9+
10+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Tue, 30 Jul 2013 10:42:02 +0200
11+
12 webbrowser-app (0.21+13.10.20130729-0ubuntu1) saucy; urgency=low
13
14 [ Olivier Tilloy ]
15
16=== modified file 'debian/control'
17--- debian/control 2013-07-29 11:52:43 +0000
18+++ debian/control 2013-07-30 11:52:27 +0000
19@@ -34,6 +34,8 @@
20 qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
21 qtdeclarative5-ubuntu-ui-toolkit-plugin,
22 qtdeclarative5-window-plugin,
23+Replaces: webbrowser-app-assets (<< 0.22)
24+Conflicts: webbrowser-app-assets (<< 0.22)
25 Description: Ubuntu web browser
26 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
27 engine and using the Ubuntu UI components.

Subscribers

People subscribed via source and target branches

to status/vote changes: