[Pkg-javascript-commits] [modestmaps-js] 10/17: Update copyright file.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository modestmaps-js.

commit 8ad3ce51a357599dfdb95d067c0a5859f613c717
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 6 20:13:06 2016 +0200

    Update copyright file.
    
    Changes:
    - Add Upstream-Name field
    - Rename BSD-3 license shortname to BSD-3-Clause
    - Use standalone license paragraphs
---
 debian/changelog |  4 ++++
 debian/copyright | 62 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ca7f06..f2c3a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ modestmaps-js (3.3.6+ds1-2) UNRELEASED; urgency=medium
   * Use libjs-jquery & libjs-jquery-ui packages instead of online copies.
   * Add patch to fix privacy breach issues.
   * Bump debhelper compatibility to 9.
+  * Update copyright file, changes:
+    - Add Upstream-Name field
+    - Rename BSD-3 license shortname to BSD-3-Clause
+    - Use standalone license paragraphs
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 May 2016 19:12:58 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 32cfc2b..fcf5538 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,26 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Modest Maps JS
 Source: https://github.com/modestmaps/modestmaps-js
 
 Files: *
 Copyright: © 2011, Stamen Design
-License: BSD-3
+Comment: https://github.com/stamen/modestmaps-js , same licensing
+ terms as modestmaps-py
+License: BSD-3-Clause
+
+Files: examples/bubble/excanvas.js
+Copyright: © 2006, Google Inc.
+License: Apache-2.0
+
+Files: test/lib/jasmine-*
+Copyright: © 2008-2011, Pivotal Labs
+License: MIT
+
+Files: debian/*
+Copyright: © 2011-2012, David Paleino <dapal at debian.org>
+License: GPL-2+
+
+License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -30,30 +47,7 @@ License: BSD-3
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Comment: https://github.com/stamen/modestmaps-js , same licensing
- terms as modestmaps-py
-
-Files: debian/*
-Copyright: © 2011-2012, David Paleino <dapal at debian.org>
-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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: examples/bubble/excanvas.js
-Copyright: © 2006, Google Inc.
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -70,8 +64,6 @@ License: Apache-2.0
  On Debian systems, the complete text of the Apache License, version 2.0,
  can be found in "/usr/share/common-licenses/Apache-2.0".
 
-Files: test/lib/jasmine-*
-Copyright: © 2008-2011, Pivotal Labs
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
@@ -91,3 +83,21 @@ License: MIT
  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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/modestmaps-js.git