Merge lp:~alan-griffiths/mir/fix-1483471 into lp:mir

[Alan Griffiths]

coding guidelines: Replace the Google favicon with a local Ubuntu one

.

[Kevin DuBois (kdub)]

alright

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3230
http://jenkins.qa.ubuntu.com/job/mir-ci/5962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/247
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/286
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/286
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5417
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5417/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7906
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/243
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/101
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26508

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5962/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3230
https://mir-jenkins.ubuntu.com/job/mir-ci/1/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/1/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

The problem still occurs with this branch:
E: mir-doc: privacy-breach-logo usr/share/doc/mir-doc/html/cppguide/index.html (https://help.ubuntu.com/favicon.ico)

It seems the origin of the logo is not a problem, but the act of fetching a logo by HTTP(S) is the problem. Because the reader of the docs may not want the world to know when/what docs they are reading locally. It should be a local image file or none at all.

[https://lintian.debian.org/tags/privacy-breach-logo.html]

[Daniel van Vugt (vanvugt)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3231
http://jenkins.qa.ubuntu.com/job/mir-ci/5975/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/299
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/299
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5434
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5434/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7919
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/250
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/108
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26539

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5975/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3231
https://mir-jenkins.ubuntu.com/job/mir-ci/24/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/25/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

lintian says yes

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'guides/CMakeLists.txt'
--- guides/CMakeLists.txt	2013-08-28 03:41:48 +0000
+++ guides/CMakeLists.txt	2016-01-11 10:05:25 +0000
@@ -13,7 +13,7 @@
     OUTPUT ${CMAKE_BINARY_DIR}/doc/html/cppguide/styleguide.css
     # See discussion above.
     COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/html/cppguide
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/styleguide.css ${CMAKE_BINARY_DIR}/doc/html/cppguide/styleguide.css
+    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/styleguide.css ${CMAKE_CURRENT_SOURCE_DIR}/favicon.ico ${CMAKE_BINARY_DIR}/doc/html/cppguide/
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/styleguide.css
     )
 

=== added file 'guides/favicon.ico'
Binary files guides/favicon.ico	1970-01-01 00:00:00 +0000 and guides/favicon.ico	2016-01-11 10:05:25 +0000 differ
=== modified file 'guides/styleguide.xsl'
--- guides/styleguide.xsl	2012-06-20 09:09:17 +0000
+++ guides/styleguide.xsl	2016-01-11 10:05:25 +0000
@@ -23,7 +23,7 @@
           <HEAD>
               <TITLE><xsl:value-of select="@title"/></TITLE>
               <META http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-              <LINK HREF="http://www.google.com/favicon.ico" type="image/x-icon"
+              <LINK HREF="favicon.ico" type="image/x-icon"
                     rel="shortcut icon"/>
               <LINK HREF="styleguide.css"
                     type="text/css" rel="stylesheet"/>