webbrowser-app

Merge lp:~osomon/webbrowser-app/screenshot into lp:webbrowser-app

  1. screenshot
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Bill Filler
Approved revision: 378
Merged at revision: 380
Proposed branch: lp:~osomon/webbrowser-app/screenshot
Merge into: lp:webbrowser-app
Diff against target: 61 lines (+7/-3)
5 files modified
.bzrignore (+1/-0)
CMakeLists.txt (+2/-1)
debian/copyright (+1/-1)
src/app/CMakeLists.txt (+2/-1)
src/app/webbrowser-app.desktop.in.in (+1/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/screenshot
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+190043@code.launchpad.net

Commit message

Ship a screenshot of the app for the apps lens.

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

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/470/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4814
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/353
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/353/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/689
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2664
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2664/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2203
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2216

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/470/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/477/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4845
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/360
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/360/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/360
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2710
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2710/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2257

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/477/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/481/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4880
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/364
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/364/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/755
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2752
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2752/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2288
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2303

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/webbrowser-app-ci/481/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2013-07-29 15:53:00 +0000
3+++ .bzrignore 2013-10-09 08:36:54 +0000
4@@ -15,6 +15,7 @@
5 src/app/config.h
6 src/app/webbrowser-app
7 src/app/webbrowser-app.desktop
8+src/app/webbrowser-app.desktop.in
9 RE:tests/unittests/.+/tst_\w+Tests$
10 tests/unittests/qml/undertest
11 po/*.gmo
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2013-09-19 14:00:46 +0000
15+++ CMakeLists.txt 2013-10-09 08:36:54 +0000
16@@ -62,4 +62,5 @@
17
18 install(FILES webbrowser-app.svg
19 DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
20-
21+install(FILES screenshot.png
22+ DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app)
23
24=== modified file 'debian/copyright'
25--- debian/copyright 2013-09-26 10:14:12 +0000
26+++ debian/copyright 2013-10-09 08:36:54 +0000
27@@ -18,7 +18,7 @@
28 On Debian systems, the full text of the GNU General Public License
29 version 3 can be found in the file /usr/share/common-licenses/GPL-3.
30
31-Files: */assets/* *.svg
32+Files: */assets/* *.png *.svg
33 Copyright: 2013 Canonical Ltd.
34 License: CC-BY-SA-3.0
35 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
36
37=== added file 'screenshot.png'
38Binary files screenshot.png 1970-01-01 00:00:00 +0000 and screenshot.png 2013-10-09 08:36:54 +0000 differ
39=== modified file 'src/app/CMakeLists.txt'
40--- src/app/CMakeLists.txt 2013-09-24 21:05:55 +0000
41+++ src/app/CMakeLists.txt 2013-10-09 08:36:54 +0000
42@@ -35,8 +35,9 @@
43 FILES_MATCHING PATTERN *.png)
44
45 set(DESKTOP_FILE webbrowser-app.desktop)
46+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
47 file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
48-file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
49+file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
50 foreach(LINE ${DESKTOP_FILE_CONTENTS})
51 string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
52 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
53
54=== renamed file 'src/app/webbrowser-app.desktop.in' => 'src/app/webbrowser-app.desktop.in.in'
55--- src/app/webbrowser-app.desktop.in 2013-09-19 18:42:31 +0000
56+++ src/app/webbrowser-app.desktop.in.in 2013-10-09 08:36:54 +0000
57@@ -13,3 +13,4 @@
58 X-Ubuntu-Touch=true
59 X-Ubuntu-Gettext-Domain=webbrowser-app
60 X-Ubuntu-Single-Instance=true
61+X-Screenshot=@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app/screenshot.png

Subscribers

People subscribed via source and target branches

to status/vote changes: