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
=== modified file '.bzrignore'
--- .bzrignore 2013-07-29 15:53:00 +0000
+++ .bzrignore 2013-10-09 08:36:54 +0000
@@ -15,6 +15,7 @@
15src/app/config.h15src/app/config.h
16src/app/webbrowser-app16src/app/webbrowser-app
17src/app/webbrowser-app.desktop17src/app/webbrowser-app.desktop
18src/app/webbrowser-app.desktop.in
18RE:tests/unittests/.+/tst_\w+Tests$19RE:tests/unittests/.+/tst_\w+Tests$
19tests/unittests/qml/undertest20tests/unittests/qml/undertest
20po/*.gmo21po/*.gmo
2122
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-09-19 14:00:46 +0000
+++ CMakeLists.txt 2013-10-09 08:36:54 +0000
@@ -62,4 +62,5 @@
6262
63install(FILES webbrowser-app.svg63install(FILES webbrowser-app.svg
64 DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)64 DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
6565install(FILES screenshot.png
66 DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app)
6667
=== modified file 'debian/copyright'
--- debian/copyright 2013-09-26 10:14:12 +0000
+++ debian/copyright 2013-10-09 08:36:54 +0000
@@ -18,7 +18,7 @@
18 On Debian systems, the full text of the GNU General Public License18 On Debian systems, the full text of the GNU General Public License
19 version 3 can be found in the file /usr/share/common-licenses/GPL-3.19 version 3 can be found in the file /usr/share/common-licenses/GPL-3.
2020
21Files: */assets/* *.svg21Files: */assets/* *.png *.svg
22Copyright: 2013 Canonical Ltd.22Copyright: 2013 Canonical Ltd.
23License: CC-BY-SA-3.023License: CC-BY-SA-3.0
24 This work is licensed under the Creative Commons Attribution-ShareAlike 3.024 This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
2525
=== added file 'screenshot.png'
26Binary files screenshot.png 1970-01-01 00:00:00 +0000 and screenshot.png 2013-10-09 08:36:54 +0000 differ26Binary files screenshot.png 1970-01-01 00:00:00 +0000 and screenshot.png 2013-10-09 08:36:54 +0000 differ
=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt 2013-09-24 21:05:55 +0000
+++ src/app/CMakeLists.txt 2013-10-09 08:36:54 +0000
@@ -35,8 +35,9 @@
35 FILES_MATCHING PATTERN *.png)35 FILES_MATCHING PATTERN *.png)
3636
37set(DESKTOP_FILE webbrowser-app.desktop)37set(DESKTOP_FILE webbrowser-app.desktop)
38configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
38file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})39file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
39file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)40file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
40foreach(LINE ${DESKTOP_FILE_CONTENTS})41foreach(LINE ${DESKTOP_FILE_CONTENTS})
41 string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")42 string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
42 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")43 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
4344
=== renamed file 'src/app/webbrowser-app.desktop.in' => 'src/app/webbrowser-app.desktop.in.in'
--- src/app/webbrowser-app.desktop.in 2013-09-19 18:42:31 +0000
+++ src/app/webbrowser-app.desktop.in.in 2013-10-09 08:36:54 +0000
@@ -13,3 +13,4 @@
13X-Ubuntu-Touch=true13X-Ubuntu-Touch=true
14X-Ubuntu-Gettext-Domain=webbrowser-app14X-Ubuntu-Gettext-Domain=webbrowser-app
15X-Ubuntu-Single-Instance=true15X-Ubuntu-Single-Instance=true
16X-Screenshot=@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app/screenshot.png

Subscribers

People subscribed via source and target branches

to status/vote changes: