浏览代码

Make LICENSE for project visible (#289)

* Update foreground.php

* Provide license label on special page "Version"
* Update link to the repo
* Bump to development version

* Update skin.json

* Provide license label for special page "Version"
* Fix repo link
* Bump to development version

* Update COPYING

Add note about packaged software
Karsten Hoffmeyer 8 年之前
父节点
当前提交
d21f8013df
共有 3 个文件被更改,包括 26 次插入13 次删除
  1. 13 2
      COPYING
  2. 9 8
      foreground.php
  3. 4 3
      skin.json

+ 13 - 2
COPYING

@@ -1,5 +1,16 @@
-Copyright (c) 2013, Garrick Van Buren, Jamie Thingelstad All rights
-reserved.
+Copyright (c) 2013, Garrick Van Buren, Jamie Thingelstad, Tom Hutchison.
+All rights reserved.
+
+The license text below "====" applies to all files within this
+distribution, other than those that are in a directory which contains
+files named "LICENSE" or "COPYING", or a subdirectory thereof. For
+those files, the license text contained in said file overrides any
+license information contained in directories of smaller depth.
+Alternative licenses are typically used for software that is provided
+by external parties, and merely packaged with the Foreground release
+for convenience.
+
+====
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

+ 9 - 8
foreground.php

@@ -6,7 +6,7 @@
  * @file
  * @ingroup Skins
  * @author Garrick Van Buren, Jamie Thingelstad, Tom Hutchison
- * @license 2-clause BSD
+ * @license BSD-2-Clause
  */
 
 if ( function_exists( 'wfLoadSkin' ) ) {
@@ -21,17 +21,18 @@ if ( function_exists( 'wfLoadSkin' ) ) {
 }
 
 $wgExtensionCredits['skin'][] = array(
-	'path'		 => __FILE__,
-	'name'		 => 'Foreground',
-	'url'		 => 'http://foreground.thingelstad.com/',
-	'author'	 => array(
+	'path' => __FILE__,
+	'name' => 'Foreground',
+	'url' => 'https://github.com/thingles/foreground',
+	'author' => array(
 		'Garrick Van Buren',
 		'Jamie Thingelstad',
 		'Tom Hutchison',
 		'...'
 	),
-	'version' => '2.0.0 (Albert)',
-	'descriptionmsg' => 'foreground-desc'
+	'version' => '2.0.1-alpha',
+	'descriptionmsg' => 'foreground-desc',
+	'license-name' => 'BSD-2-Clause'
 );
 
 $wgValidSkinNames['foreground'] = 'Foreground';
@@ -91,4 +92,4 @@ $wgResourceModules['skins.foreground.js'] = array(
 	),
 	'remoteBasePath' => &$GLOBALS['wgStylePath'],
 	'localBasePath'  => &$GLOBALS['wgStyleDirectory']
-);
+);

+ 4 - 3
skin.json

@@ -1,14 +1,15 @@
 {
 	"name": "Foreground",
-	"version": "2.0.0 (Albert)",
+	"version": "2.0.1-alpha",
 	"author": [
 		"Garrick Van Buren",
 		"Jamie Thingelstad",
 		"Tom Hutchison",
 		"..."
 	],
-	"url": "http://foreground.thingelstad.com",
+	"url": "https://github.com/thingles/foreground",
 	"descriptionmsg": "foreground-desc",
+	"license-name": "BSD-2-Clause",
 	"type": "skin",
 	"ValidSkinNames": {
 		"foreground": "Foreground"
@@ -72,4 +73,4 @@
 	},
 	"config": {},
 	"manifest_version": 1
-}
+}