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
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-03-10 15:35:29 +0000
3+++ debian/changelog 2017-03-21 20:38:47 +0000
4@@ -1,3 +1,16 @@
5+webbrowser-app (0.23+17.04.20170320-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ [ Andrew Hayzen ]
8+ * Add access to the downloads folder to the generated apparmor profile
9+ rather than via write_paths in the manifest to work around LP: #1620635
10+
11+ [ Olivier Tilloy ]
12+ * Snap package: add two extra build deps now required by
13+ lp:ubuntu-ui-extras
14+ * Add a desktop UA override for dropbox.com (LP: #1672804)
15+
16+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Mon, 20 Mar 2017 19:56:31 +0100
17+
18 webbrowser-app (0.23+17.04.20170310-0ubuntu1) zesty; urgency=medium
19
20 [ Alexandre Abreu ]
21
22=== modified file 'debian/rules'
23--- debian/rules 2017-03-07 11:42:15 +0000
24+++ debian/rules 2017-03-21 20:38:47 +0000
25@@ -20,7 +20,8 @@
26 sed 's#^}$$#\n /sys/class/ r,\n /sys/class/input/ r,\n /run/udev/data/** r,\n}#g' | \
27 egrep -v '^\s*deny /dev/ r,\s*$$' | \
28 sed 's#^\(\s*\)deny\(\s\+/{run,dev}/shm/pulse-shm\*\s\+w,\).*$$#\1owner\2#g' | \
29- sed 's#^}$$#\n /dev/dri/ r,\n /sys/devices/pci[0-9]*/**/config r,\n}#g' \
30+ sed 's#^}$$#\n /dev/dri/ r,\n /sys/devices/pci[0-9]*/**/config r,\n}#g' | \
31+ sed 's#^}$$#\n @{HOME}/@{XDG_DOWNLOAD_DIR}/** rwk,\n}#g' \
32 > ./debian/usr.bin.webbrowser-app
33 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
34 apparmor_parser -QTK ./debian/usr.bin.webbrowser-app
35
36=== modified file 'debian/webbrowser-app-apparmor.manifest'
37--- debian/webbrowser-app-apparmor.manifest 2017-03-06 18:02:25 +0000
38+++ debian/webbrowser-app-apparmor.manifest 2017-03-21 20:38:47 +0000
39@@ -37,7 +37,6 @@
40 "/sys/devices/**/input*/"
41 ],
42 "write_path": [
43- "@{HOME}/@{XDG_DOWNLOAD_DIR}/"
44 ]
45 }
46 }
47
48=== modified file 'snap/snapcraft.yaml'
49--- snap/snapcraft.yaml 2017-03-03 14:52:45 +0000
50+++ snap/snapcraft.yaml 2017-03-21 20:38:47 +0000
51@@ -84,6 +84,8 @@
52 - qtbase5-dev
53 - qtdeclarative5-dev
54 - libexiv2-dev
55+ - libcups2-dev
56+ - cmake-extras
57 stage-packages:
58 - libexiv2-14
59 build-attributes: [no-system-libraries]
60
61=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
62--- src/Ubuntu/Web/ua-overrides-desktop.js.in 2017-02-20 12:07:45 +0000
63+++ src/Ubuntu/Web/ua-overrides-desktop.js.in 2017-03-21 20:38:47 +0000
64@@ -67,4 +67,7 @@
65
66 // Dailymotion (https://launchpad.net/bugs/1662826)
67 ["^http:\/\/www\.dailymotion\.com\/", chrome_desktop_override],
68+
69+ // Dropbox (https://launchpad.net/bugs/1672804)
70+ ["^https:\/\/www\.dropbox\.com\/", chrome_desktop_override],
71 ];

Subscribers

People subscribed via source and target branches

to status/vote changes: