webbrowser-app

Merge lp:~osomon/webbrowser-app/staging-20170320 into lp:webbrowser-app

  1. staging-20170320
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1639
Merged at revision: 1585
Proposed branch: lp:~osomon/webbrowser-app/staging-20170320
Merge into: lp:webbrowser-app
Diff against target: 71 lines (+20/-2)
5 files modified
debian/changelog (+13/-0)
debian/rules (+2/-1)
debian/webbrowser-app-apparmor.manifest (+0/-1)
snap/snapcraft.yaml (+2/-0)
src/Ubuntu/Web/ua-overrides-desktop.js.in (+3/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/staging-20170320
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+320418@code.launchpad.net

Commit message

* Snap package: add two extra build deps now required by lp:ubuntu-ui-extras
* Add a desktop UA override for dropbox.com (LP: #1672804)

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1637
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2329/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2328
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2150
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2150/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2150
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2150/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2150
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2150/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2150
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2150/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2150
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2150/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2150/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/3/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/staging-20170320 updated
1638. By Olivier Tilloy

Merge one change from staging.

1639. By Olivier Tilloy

Update changelog entry.

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1639
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/4/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2334
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2333
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2155
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2155/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2155
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2155/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2155
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2155/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2155
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2155/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2155
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2155/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2155
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2155/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/4/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/changelog'
--- debian/changelog 2017-03-10 15:35:29 +0000
+++ debian/changelog 2017-03-21 20:38:47 +0000
@@ -1,3 +1,16 @@
1webbrowser-app (0.23+17.04.20170320-0ubuntu1) UNRELEASED; urgency=medium
2
3 [ Andrew Hayzen ]
4 * Add access to the downloads folder to the generated apparmor profile
5 rather than via write_paths in the manifest to work around LP: #1620635
6
7 [ Olivier Tilloy ]
8 * Snap package: add two extra build deps now required by
9 lp:ubuntu-ui-extras
10 * Add a desktop UA override for dropbox.com (LP: #1672804)
11
12 -- Olivier Tilloy <olivier.tilloy@canonical.com> Mon, 20 Mar 2017 19:56:31 +0100
13
1webbrowser-app (0.23+17.04.20170310-0ubuntu1) zesty; urgency=medium14webbrowser-app (0.23+17.04.20170310-0ubuntu1) zesty; urgency=medium
215
3 [ Alexandre Abreu ]16 [ Alexandre Abreu ]
417
=== modified file 'debian/rules'
--- debian/rules 2017-03-07 11:42:15 +0000
+++ debian/rules 2017-03-21 20:38:47 +0000
@@ -20,7 +20,8 @@
20 sed 's#^}$$#\n /sys/class/ r,\n /sys/class/input/ r,\n /run/udev/data/** r,\n}#g' | \20 sed 's#^}$$#\n /sys/class/ r,\n /sys/class/input/ r,\n /run/udev/data/** r,\n}#g' | \
21 egrep -v '^\s*deny /dev/ r,\s*$$' | \21 egrep -v '^\s*deny /dev/ r,\s*$$' | \
22 sed 's#^\(\s*\)deny\(\s\+/{run,dev}/shm/pulse-shm\*\s\+w,\).*$$#\1owner\2#g' | \22 sed 's#^\(\s*\)deny\(\s\+/{run,dev}/shm/pulse-shm\*\s\+w,\).*$$#\1owner\2#g' | \
23 sed 's#^}$$#\n /dev/dri/ r,\n /sys/devices/pci[0-9]*/**/config r,\n}#g' \23 sed 's#^}$$#\n /dev/dri/ r,\n /sys/devices/pci[0-9]*/**/config r,\n}#g' | \
24 sed 's#^}$$#\n @{HOME}/@{XDG_DOWNLOAD_DIR}/** rwk,\n}#g' \
24 > ./debian/usr.bin.webbrowser-app25 > ./debian/usr.bin.webbrowser-app
25ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))26ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
26 apparmor_parser -QTK ./debian/usr.bin.webbrowser-app27 apparmor_parser -QTK ./debian/usr.bin.webbrowser-app
2728
=== modified file 'debian/webbrowser-app-apparmor.manifest'
--- debian/webbrowser-app-apparmor.manifest 2017-03-06 18:02:25 +0000
+++ debian/webbrowser-app-apparmor.manifest 2017-03-21 20:38:47 +0000
@@ -37,7 +37,6 @@
37 "/sys/devices/**/input*/"37 "/sys/devices/**/input*/"
38 ],38 ],
39 "write_path": [39 "write_path": [
40 "@{HOME}/@{XDG_DOWNLOAD_DIR}/"
41 ]40 ]
42 }41 }
43 }42 }
4443
=== modified file 'snap/snapcraft.yaml'
--- snap/snapcraft.yaml 2017-03-03 14:52:45 +0000
+++ snap/snapcraft.yaml 2017-03-21 20:38:47 +0000
@@ -84,6 +84,8 @@
84 - qtbase5-dev84 - qtbase5-dev
85 - qtdeclarative5-dev85 - qtdeclarative5-dev
86 - libexiv2-dev86 - libexiv2-dev
87 - libcups2-dev
88 - cmake-extras
87 stage-packages:89 stage-packages:
88 - libexiv2-1490 - libexiv2-14
89 build-attributes: [no-system-libraries]91 build-attributes: [no-system-libraries]
9092
=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
--- src/Ubuntu/Web/ua-overrides-desktop.js.in 2017-02-20 12:07:45 +0000
+++ src/Ubuntu/Web/ua-overrides-desktop.js.in 2017-03-21 20:38:47 +0000
@@ -67,4 +67,7 @@
6767
68 // Dailymotion (https://launchpad.net/bugs/1662826)68 // Dailymotion (https://launchpad.net/bugs/1662826)
69 ["^http:\/\/www\.dailymotion\.com\/", chrome_desktop_override],69 ["^http:\/\/www\.dailymotion\.com\/", chrome_desktop_override],
70
71 // Dropbox (https://launchpad.net/bugs/1672804)
72 ["^https:\/\/www\.dropbox\.com\/", chrome_desktop_override],
70];73];

Subscribers

People subscribed via source and target branches

to status/vote changes: