[Pkg-javascript-commits] [node-mapnik] 09/09: Update copyright file.
Bas Couwenberg
sebastic at debian.org
Sun Sep 11 13:56:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository node-mapnik.
commit 5530a9ce95e2a819f076938b3eda6638f7aa31ef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 11 15:55:09 2016 +0200
Update copyright file.
Changes:
- Drop license & copyright for anchor.js, removed upstream
---
debian/changelog | 2 ++
debian/copyright | 24 ------------------------
debian/source.lintian-overrides | 5 -----
3 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index bae3cd3..dcf8c12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ node-mapnik (3.5.14+dfsg-1) UNRELEASED; urgency=medium
* Bump minimum required node-nan to 2.4.0.
* Drop patches applied upstream, refresh remaining patches.
* Add patch to use packaged dependencies instead of npm ones.
+ * Update copyright file, changes:
+ - Drop license & copyright for anchor.js, removed upstream
-- Bas Couwenberg <sebastic at debian.org> Sun, 11 Sep 2016 14:33:52 +0200
diff --git a/debian/copyright b/debian/copyright
index d7993fa..3167daa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,10 +15,6 @@ Files: deps/clipper/clipper.cpp
Copyright: 2010-2015, Angus Johnson
License: BSL-1.0
-Files: documentation/*/assets/anchor.js
-Copyright: 2015, Bryan Braun
-License: Expat
-
Files: test/data/dir*/*DejaVuSansMono-BoldOblique.ttf
test/data/map-a/DejaVuSerifCondensed-BoldItalic.ttf
test/data/map-b/DejaVuSerifCondensed-Bold.ttf
@@ -87,26 +83,6 @@ License: BSL-1.0
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 72086ae..c0b49d0 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -3,8 +3,3 @@ node-mapnik source: insane-line-length-in-source-file test/palette.test.js *
node-mapnik source: source-contains-prebuilt-javascript-object test/palette.test.js *
node-mapnik source: source-is-missing test/palette.test.js *
-# False positive on font data
-node-mapnik source: insane-line-length-in-source-file documentation/3.5/assets/anchor.js *
-node-mapnik source: source-contains-prebuilt-javascript-object documentation/3.5/assets/anchor.js *
-node-mapnik source: source-is-missing documentation/3.5/assets/anchor.js *
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git
More information about the Pkg-javascript-commits
mailing list