From baebfe52d88df280b0c1d9a64653763ce49058f4 Mon Sep 17 00:00:00 2001 From: Quintin Willison Date: Mon, 27 Apr 2020 09:37:56 +0100 Subject: [PATCH] Conform packaging file and apply Apache 2.0 license as we've made non-trivial changes to this work. Correctness of Apache license being a superset of MIT nicely summarised here: https://opensource.stackexchange.com/a/7391 --- LICENSE | 16 ++++++++++++++++ package.json | 27 +++++++++++++-------------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 013c6cb..b4048b4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,19 @@ +Copyright 2019-2020 Ably Real-time Ltd (ably.com) + +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 + + http://www.apache.org/licenses/LICENSE-2.0 + +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. + +-- + MIT License Copyright (c) 2016 William MacDonald diff --git a/package.json b/package.json index 74edc02..fe76971 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,28 @@ { "name": "@ably/vcdiff-decoder", "version": "1.0.2", - "description": "Pure JavaScript vcdiff decoder that works with binary deltas from Google's open-vcdiff", + "description": "Pure JavaScript Vcdiff decoder that works with binary deltas from Google's open-vcdiff", + "license": "Apache-2.0", + "homepage": "https://ably.io/", "main": "lib/vcdiff_decoder.js", "scripts": { - "grunt": "./node_modules/grunt-cli/bin/grunt", - "test": "./node_modules/grunt-cli/bin/grunt test:all" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/ably-forks/vcdiff-decoder.git" + "grunt": "grunt", + "test": "grunt test:all" }, + "repository": "ably-forks/vcdiff-decoder.git", "keywords": [ - "sdch", "delta", - "cache", "decoding", - "compression" + "decoder", + "compression", + "Vcdiff", + "diff" ], - "author": "William MacDonald", + "author": "Ably Real-time Ltd ", "contributors": [ + "William MacDonald", "Tsviatko Yovtchev (https://codemerx.com)" ], - "license": "MIT", "bugs": { "url": "https://github.com/ably-forks/vcdiff-decoder/issues" }, @@ -52,6 +52,5 @@ "vcdiff": "baranov1ch/node-vcdiff", "webpack": "^4.42.1", "webpack-cli": "^3.3.11" - }, - "homepage": "https://github.com/ably-forks/vcdiff-decoder" + } }