[mongo-java-driver] 04/04: Update debian/copyright

Fri Aug 19 13:27:14 UTC 2016

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

grinorcole-guest pushed a commit to branch master
in repository mongo-java-driver.

commit 5a84630aa1ab0e0c7a2f6d96fa747e2addae6db8
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Fri Aug 19 14:25:31 2016 +0100

    Update debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 88 +++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e51a14..feb839b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mongo-java-driver (3.3.0-1) UNRELEASED; urgency=medium
 
   [ Christopher Hoskin ]
   * Import new upstream (3.3.0)
+  * Update debian/copyright
 
  -- Christopher Hoskin <christopher.hoskin at gmail.com>  Fri, 19 Aug 2016 13:50:19 +0100
 
diff --git a/debian/copyright b/debian/copyright
index c10fa48..4574f92 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,37 +26,18 @@ Comment: Exclude settings.jar (for IntelliJ IDE) and Gradle wrapper (not needed)
 
 
 Files: *
-Copyright: 2009-2014, 10gen, Inc
+Copyright: 2008-2016, MongoDB, Inc
 License: Apache-2.0
+Comment: 10gen, Inc changed their name to MongoDB, Inc in 2013.
 
-Files: src/main/org/bson/io/UTF8Encoding.java
-Copyright: 1997-2008, PostgreSQL Global Development Group
-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:
- .
- 1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 3. Neither the name of the PostgreSQL Global Development Group nor the names
-    of its contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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.
+Files: driver-core/src/main/com/mongodb/annotations/Beta.java
+Copyright: 2010, The Guava Authors
+  2015, MongoDB, Inc.
+License: Apache-2.0
 
-Files: src/main/org/bson/util/annotations/*
+Files: driver-core/src/main/com/mongodb/annotations/Immutable.java
+ driver-core/src/main/com/mongodb/annotations/NotThreadSafe.java
+ driver-core/src/main/com/mongodb/annotations/ThreadSafe.java
 Copyright: 2005, Brian Goetz and Tim Peierls
 License: CC-BY-SA-3.0
 Comment: Those files are very simple modifications of code included in
@@ -65,7 +46,7 @@ Comment: Those files are very simple modifications of code included in
  software), this source code was relicensed by its author Brian Goetz in 2008
  under Creative Commons 3.0 license. For more information, please review
  the emails exchanged between Brian Goetz and Torsten Werner
- what are shown below:
+ which are shown below:
  .
  Torsten Werner <twerner at debian.org> has got the following emails from
  Brian Goetz about the license change to CC 3.0:
@@ -140,12 +121,61 @@ Comment: Those files are very simple modifications of code included in
 
 Files: debian/*
 Copyright: 2014, Emmanuel Bourg <ebourg at apache.org>
+ 2016, Christopher Hoskin <christopher.hoskin at gmail.com>
+License: Apache-2.0
+
+Files: driver/src/main/org/bson/util/AbstractCopyOnWriteMap.java
+ driver/src/main/org/bson/util/CopyOnWriteMap.java
+ bson/src/main/org/bson/assertions/Assertions.java
+ driver-core/src/main/com/mongodb/assertions/Assertions.java
+Copyright: 2008-2014, Atlassian Pty Ltd
+  2008-2015, MongoDB, Inc.
 License: Apache-2.0
 
+Files: driver-core/src/main/com/mongodb/connection/Base64Codec.java
+Copyright: 1999-2005, The Apache Software Foundation.
+  2008-2014, MongoDB, Inc.
+License: Apache-2.0
+
+Files: driver-core/src/main/com/mongodb/connection/netty/ReadTimeoutHandler.java
+Copyright: 2012, The Netty Project
+  2015, MongoDB, Inc.
+License: Apache-2.0
+
+Files: docs/reference/themes/mongodb/static/css/bootstrap-custom.css
+Copyright: 2013, Twitter, Inc
+  2013, Nicolas Gallagher and Jonathan Neal
+License: Expat
+Comment: Whilst this file has a Bootstrap v3.0.0 / Twitter copyright header
+ it appears to be adapted from v2.1.0 of normalize.css, which has a MIT License
+ https://github.com/necolas/normalize.css/blob/v2.1.0/normalize.css
+
+
+
 License: Apache-2.0
  On Debian systems, the full text of the Apache-2.0 license
  can be found in the file '/usr/share/common-licenses/Apache-2.0'
 
+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: CC-BY-SA-3.0
  Attribution 3.0 Unported
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mongo-java-driver.git

