Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/276833
Change subject: Re-license using OSI-approved Apache 2.0 license ...................................................................... Re-license using OSI-approved Apache 2.0 license WTFPL is not OSI approved and not recommended for use by the FSF. Apache 2.0 is probably the closest to the intentions of WTFPL, while still blocking patent treachery. Change-Id: I5b7c142d54dbb5ec0cbb90449be558f40303e717 --- M COPYING M README M SpecialUrlShortener.php M UrlShortener.hooks.php M UrlShortener.utils.php M extension.json 6 files changed, 15 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UrlShortener refs/changes/33/276833/1 diff --git a/COPYING b/COPYING index 5c93f45..51fca54 100644 --- a/COPYING +++ b/COPYING @@ -1,13 +1,11 @@ - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at - Copyright (C) 2004 Sam Hocevar <[email protected]> + http://www.apache.org/licenses/LICENSE-2.0 - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/README b/README index 93d014f..1d00c67 100644 --- a/README +++ b/README @@ -113,5 +113,5 @@ == License == -© 2014 Yuvaraj Pandian ([email protected]) under the WTFPL, see the COPYING -file for the full license. +© 2014 Yuvaraj Pandian ([email protected]) under the Apache 2.0 license, +see the COPYING file for the full license. diff --git a/SpecialUrlShortener.php b/SpecialUrlShortener.php index 7e999cf..5ce0c11 100644 --- a/SpecialUrlShortener.php +++ b/SpecialUrlShortener.php @@ -6,7 +6,7 @@ * @ingroup Extensions * @author Yuvi Panda, http://yuvi.in * @copyright © 2014 Yuvaraj Pandian ([email protected]) - * @licence WTFPL + * @licence Apache 2.0 */ if ( !defined( 'MEDIAWIKI' ) ) { diff --git a/UrlShortener.hooks.php b/UrlShortener.hooks.php index f7a4865..a904895 100644 --- a/UrlShortener.hooks.php +++ b/UrlShortener.hooks.php @@ -5,7 +5,7 @@ * @ingroup Extensions * @author Yuvi Panda, http://yuvi.in * @copyright © 2014 Yuvaraj Pandian ([email protected]) - * @licence WTFPL + * @licence Apache 2.0 */ class UrlShortenerHooks { diff --git a/UrlShortener.utils.php b/UrlShortener.utils.php index 166a450..87e3ea7 100755 --- a/UrlShortener.utils.php +++ b/UrlShortener.utils.php @@ -6,7 +6,7 @@ * @ingroup Extensions * @author Yuvi Panda, http://yuvi.in * @copyright © 2014 Yuvaraj Pandian ([email protected]) - * @licence WTFPL + * @licence Apache 2.0 */ if ( !defined( 'MEDIAWIKI' ) ) { diff --git a/extension.json b/extension.json index 8c622a3..3079b14 100644 --- a/extension.json +++ b/extension.json @@ -9,7 +9,7 @@ ], "url": "https://www.mediawiki.org/wiki/Extension:UrlShortener";, "descriptionmsg": "urlshortener-desc", - "license-name": "WTFPL", + "license-name": "Apache-2.0", "type": "specialpage", "requires": { "MediaWiki": ">= 1.27.0" -- To view, visit https://gerrit.wikimedia.org/r/276833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b7c142d54dbb5ec0cbb90449be558f40303e717 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UrlShortener Gerrit-Branch: master Gerrit-Owner: Legoktm <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
