[Pkg-bitcoin-commits] [electrum] 18/24: More copyright fixes.

Sun Aug 23 22:44:06 UTC 2015

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

mithrandi pushed a commit to branch master
in repository electrum.

commit ab8eb38cdbc663863b9e7161cdd71b283170d473
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Fri Aug 21 00:00:18 2015 +0200

    More copyright fixes.
---
 debian/copyright | 78 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3408b43..4af8893 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,22 +10,10 @@ Comment:
  Various authors are described in the AUTHORS file, including parts on
  which they worked and hold license.
 
-Files: aes/*
-Copyright: 2008, Josh Davis <http://www.josh-davis.org>
- Alex Martelli <http://www.aleax.it>
-License: Apache-2
-
 Files: debian/*
 Copyright: 2013, Vasudev Kamath
 License: GPL-3+
 
-Files: ecdsa/*
-Copyright: 2010, Brian Warner
-License: Expat
-Comment:
- Portions written in 2005 by Peter Pearson are placed in public
- domain.
-
 Files: gui/jsonrpc.py
 Copyright: 2014, 2015, Thomas Voegtlin
 License: GPL-3+
@@ -75,7 +63,7 @@ License: BSD-2-clause
 
 Files: lib/socks.py
 Copyright: 2006, Dan-Haim.
-License: BSD-2-clause
+License: BSD-3-clause~Dan
 Comment:
  Minor modifications made by Christopher Gilbert
  <http://motomastyle.com> for use in PyLoris.
@@ -94,7 +82,7 @@ License: Apache-2.0
 
 Files: packages/google/*
 Copyright: 2007-2009, 2012, Google Inc.
-License: BSD-3-clause
+License: BSD-3-clause~Google
 
 Files: packages/pbkdf2.py
 Copyright: 2007-2011, Dwayne C. Litzenberger <dlitz at dlitz.net>
@@ -121,12 +109,6 @@ Files: scripts/authenticator.py
 Copyright: 2014, 2015, Thomas Voegtlin
 License: GPL-3+
 
-License: Apache-2
- Comment:
- .
- On Debian system Apache-2.0 license can be found in
- /usr/share/common-licenses/Apache-2.0 .
-
 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.
@@ -164,12 +146,58 @@ License: BSD-2-clause
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
- This program is free software; you can redistribute it and/or modify
- it under the terms of the BSD license.
+License: BSD-3-clause~Dan
+ 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 Dan Haim nor the names of his contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY DAN HAIM "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 DAN HAIM OR HIS 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,
+ 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
+ DAMANGE.
+
+License: BSD-3-clause~Google
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+     * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+     * 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.
+     * Neither the name of Google Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
  .
- On Debian systems, the complete text of the BSD license in
- '/usr/share/common-licenses/BSD'.
+ 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.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git

