[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Add powered by Debian icon in footer

2016-09-17 Thread Legoktm (Code Review) 
Legoktm has submitted this change and it was merged.

Change subject: Add powered by Debian icon in footer
..


Add powered by Debian icon in footer

Icon was created by Isarra, and the source SVG is provided and can also
be obtained from
. It is
CC-BY-SA-3.0 licensed as a derivative of the open Debian logo and was
converted to PNG using Inkscape.

Change-Id: Ib50205d5a1119dbbe68f1aac3dc471f44622c23f
---
M debian/changelog
M debian/copyright
A debian/images/poweredby_debian.svg
A debian/images/poweredby_debian_1_5x.png
A debian/images/poweredby_debian_1x.png
A debian/images/poweredby_debian_2x.png
M debian/mediawiki.install
M debian/patches/debian_installer_overrides.diff
A debian/source/include-binaries
9 files changed, 643 insertions(+), 8 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Muehlenhoff: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index e48cdcb..8b46599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-mediawiki (1:1.27.1-3) unstable; urgency=high
+mediawiki (1:1.27.1-3) UNRELEASED; urgency=medium
 
   * Ensure mediawiki depends upon the same version of mediawiki-classes
+  * Add powered by Debian icon in footer
 
  -- Kunal Mehta   Tue, 13 Sep 2016 04:17:42 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 77d2502..78131e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -492,6 +492,10 @@
 Copyright: 2013-2015, Yahoo! Inc.
 License: Expat
 
+Files: debian/images/*
+Copyright: 2016, Isarra
+License: CC-BY-SA-3.0
+
 License: GPL-2.0+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -1174,6 +1178,367 @@
  .
  Creative Commons may be contacted at https://creativecommons.org/.
 
+License: CC-BY-SA-3.0
+ Creative Commons Legal Code
+ .
+ Attribution-ShareAlike 3.0 Unported
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+ DAMAGES RESULTING FROM ITS USE.
+ .
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ .
+ 1. Definitions
+ .
+  a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation,
+ derivative work, arrangement of music or other alterations of a
+ literary or artistic work, or phonogram or performance and includes
+ cinematographic adaptations or any other form in which the Work may be
+ recast, transformed, or adapted including in any form recognizably
+ derived from the original, except that a work that constitutes a
+ Collection will not be considered an Adaptation for the purpose of
+ this License. For the avoidance of doubt, where the Work is a musical
+ work, performance or phonogram, the synchronization of the Work in
+ timed-relation with a moving image ("synching") will be considered an
+ Adaptation for the purpose of this License.
+  b. "Collection" means a collection of literary or artistic works, such as
+ encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed
+ in Section 1(f) below, which, by reason of the selection and
+ arrangement of their contents, constitute intellectual creations, in
+ which the Work is included in its entirety in unmodified form along
+ with one or more other contributions, each constituting separate and
+ independent works in themselves, which together are assembled into a
+ collective whole. A work that constitutes a Collection will not be
+ considered an Adaptation (as defined below) for the purposes of this
+ License.
+  c. "Creative Commons Compatible License" means a license that is listed
+ at https://creativecommons.org/compatiblelicenses that has been
+ approved by Creative Commons as being essentially equivalent to this
+ License, including, at a minimum, because that

[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Add powered by Debian icon in footer

2016-09-15 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310919

Change subject: Add powered by Debian icon in footer
..

Add powered by Debian icon in footer

Icon was created by Isarra, and the source SVG can be obtained from
. It is
CC-BY-SA-3.0 licensed as a derivative of the open Debian logo.

Change-Id: Ib50205d5a1119dbbe68f1aac3dc471f44622c23f
---
M debian/changelog
M debian/copyright
M debian/patches/debian_installer_overrides.diff
A debian/patches/poweredby_debian.diff
M debian/patches/series
5 files changed, 399 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/19/310919/1

diff --git a/debian/changelog b/debian/changelog
index e48cdcb..8b46599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-mediawiki (1:1.27.1-3) unstable; urgency=high
+mediawiki (1:1.27.1-3) UNRELEASED; urgency=medium
 
   * Ensure mediawiki depends upon the same version of mediawiki-classes
+  * Add powered by Debian icon in footer
 
  -- Kunal Mehta   Tue, 13 Sep 2016 04:17:42 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 77d2502..bdf05d9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -492,6 +492,10 @@
 Copyright: 2013-2015, Yahoo! Inc.
 License: Expat
 
+Files: debian/patches/poweredby_debian.diff
+Copyright: 2016, Isarra
+License: CC-BY-SA-3.0
+
 License: GPL-2.0+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -1174,6 +1178,367 @@
  .
  Creative Commons may be contacted at https://creativecommons.org/.
 
+License: CC-BY-SA-3.0
+ Creative Commons Legal Code
+ .
+ Attribution-ShareAlike 3.0 Unported
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+ DAMAGES RESULTING FROM ITS USE.
+ .
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ .
+ 1. Definitions
+ .
+  a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation,
+ derivative work, arrangement of music or other alterations of a
+ literary or artistic work, or phonogram or performance and includes
+ cinematographic adaptations or any other form in which the Work may be
+ recast, transformed, or adapted including in any form recognizably
+ derived from the original, except that a work that constitutes a
+ Collection will not be considered an Adaptation for the purpose of
+ this License. For the avoidance of doubt, where the Work is a musical
+ work, performance or phonogram, the synchronization of the Work in
+ timed-relation with a moving image ("synching") will be considered an
+ Adaptation for the purpose of this License.
+  b. "Collection" means a collection of literary or artistic works, such as
+ encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed
+ in Section 1(f) below, which, by reason of the selection and
+ arrangement of their contents, constitute intellectual creations, in
+ which the Work is included in its entirety in unmodified form along
+ with one or more other contributions, each constituting separate and
+ independent works in themselves, which together are assembled into a
+ collective whole. A work that constitutes a Collection will not be
+ considered an Adaptation (as defined below) for the purposes of this
+ License.
+  c. "Creative Commons Compatible License" means a license that is listed
+ at https://creativecommons.org/compatiblelicenses that has been
+ approved by Creative Commons as being essentially equivalent to this
+ License, including, at a minimum, because that license: (i) contains
+ terms that have the same purpose, meaning and effect as the License
+ Elements of this License; and, (ii) explicitly permits the relicensing
+ of adaptations of works made available