[Python-modules-commits] r21836 - in packages/pyzmq/trunk/debian (changelog copyright)

[jtaylor-guest at users.alioth.debian.org]

    Date: Sunday, May 20, 2012 @ 13:07:04
  Author: jtaylor-guest
Revision: 21836

update debian/copyright for relicensing of non core files to BSD-3-clause

Modified:
  packages/pyzmq/trunk/debian/changelog
  packages/pyzmq/trunk/debian/copyright

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2012-05-20 13:06:55 UTC (rev 21835)
+++ packages/pyzmq/trunk/debian/changelog	2012-05-20 13:07:04 UTC (rev 21836)
@@ -1,8 +1,9 @@
 pyzmq (2.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * update debian/copyright for relicensing of non core files to BSD-3-clause
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 20 May 2012 14:00:48 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 20 May 2012 14:31:34 +0200
 
 pyzmq (2.1.11-1) unstable; urgency=low
 

Modified: packages/pyzmq/trunk/debian/copyright
===================================================================
--- packages/pyzmq/trunk/debian/copyright	2012-05-20 13:06:55 UTC (rev 21835)
+++ packages/pyzmq/trunk/debian/copyright	2012-05-20 13:07:04 UTC (rev 21836)
@@ -1,28 +1,89 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pyzmq
 Upstream-Contact: Brian E. Granger <ellisonbg at gmail.com>
 Source: https://github.com/zeromq/pyzmq/downloads
 
 Files: *
-Copyright: © 2010-2011, Brian E. Granger,
- © 2010, Andrew Gwozdziewycz,
- © 2010, Fernando Perez,
- © 2011, Min Ragan-Kelley
+Copyright:  2010-2012, Brian Granger
+ 2010-2012, Min Ragan-Kelley
+License: BSD-3-clause
+
+Files: examples/mongodb/*
+Copyright: 2010, Justin Riley
+License: BSD-3-clause
+
+Files: examples/chat/*
+Copyright: 2010, Andrew Gwozdziewycz
 License: LGPL-3
 
+Files: examples/device/client.py examples/device/server.py
+Copyright: 2010, Brian E. Granger
+ 2010, Eugene Chernyshov
+License: LGPL-3
+
+Files: zmq/core/*
+Copyright: 2010-2011, Brian E. Granger
+ 2010, Andrew Gwozdziewycz
+ 2010, Fernando Perez
+ 2011, Min Ragan-Kelley
+License: LGPL-3
+
+Files: zmq/devices/monitoredqueue.pxd
+Copyright: 2010, Brian E. Granger
+ 2010, Min Ragan-Kelley
+License: LGPL-3
+
 Files: perf/*
-Copyright: © 2007-2010, iMatix Corporation.
+Copyright: 2007-2010, iMatix Corporation
 License: LGPL-3
 
+Files: docs/sphinxext/sphinx_cython.py
+Copyright: 2010, Nikolaus Rath <Nikolaus at rath.org>
+License: LGPL-3
+
+Files: zmq/ssh/forward.py
+Copyright: 2003-2007, Robey Pointer <robeypointer at gmail.com>,
+ 2010-2011, IPython Development Team
+License: LGPL-2.1
+
 Files: zmq/eventloop/zmqstream.py
  zmq/eventloop/ioloop.py
-Copyright: © 2009, Facebook.
+Copyright: 2009, Facebook.
 License: Apache-2.0
 
 Files: debian/*
-Copyright: © 2010-2011, Miguel Landaeta <miguel at miguel.cc>
+Copyright: 2010-2011, Miguel Landaeta <miguel at miguel.cc>
 License: Public Domain
 
+License: BSD-3-clause
+ All rights reserved.
+ .
+ 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 PyZMQ 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.
+
 License: LGPL-3
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -42,6 +103,24 @@
  The full text of the GNU Lesser General Public License version 3
  is distributed in /usr/share/common-licenses/LGPL-3 on Debian systems.
 
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ The full text of the GNU Lesser General Public License version 2.1
+ is distributed in /usr/share/common-licenses/LGPL-2.1 on Debian systems.
+
 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.