PROTON-885: add manifest, move license file into setuputils
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/c1f9ed41 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/c1f9ed41 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/c1f9ed41 Branch: refs/heads/master Commit: c1f9ed41ac144f4cd451af4f3e0d0ba36dd1f203 Parents: d98fa57 Author: Ken Giusti <[email protected]> Authored: Wed May 20 19:56:29 2015 -0400 Committer: Ken Giusti <[email protected]> Committed: Wed May 20 19:56:29 2015 -0400 ---------------------------------------------------------------------- LICENSE | 9 +++--- proton-c/bindings/python/MANIFEST.in | 2 ++ proton-c/bindings/python/PYZMQ_LICENSE.BSD | 32 -------------------- .../python/setuputils/PYZMQ_LICENSE.BSD | 32 ++++++++++++++++++++ 4 files changed, 39 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c1f9ed41/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 6d1be4d..7d0fda9 100644 --- a/LICENSE +++ b/LICENSE @@ -208,7 +208,8 @@ Proton includes freegetopt with a separate BSD license. Your use of the source code for freegetopt is subject to the terms and conditions of its license in examples/include/pncompat/internal/LICENSE. -The python bindings includes files derived by PyZMQ an are licensed -with a separate Modified BSD license. Use of the source code in these -files are subject to the terms and conditions in the license: -proton-c/bindings/python/PYZMQ_LICENSE.BSD. +The setup scripts for the python bindings include files derived by +PyZMQ and are licensed with a separate Modified BSD license. Use of +the source code in these setup files are subject to the terms and +conditions in the license: +proton-c/bindings/python/setuputils/PYZMQ_LICENSE.BSD. http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c1f9ed41/proton-c/bindings/python/MANIFEST.in ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/MANIFEST.in b/proton-c/bindings/python/MANIFEST.in new file mode 100644 index 0000000..a89a962 --- /dev/null +++ b/proton-c/bindings/python/MANIFEST.in @@ -0,0 +1,2 @@ +graft docs +graft setuputils http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c1f9ed41/proton-c/bindings/python/PYZMQ_LICENSE.BSD ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/PYZMQ_LICENSE.BSD b/proton-c/bindings/python/PYZMQ_LICENSE.BSD deleted file mode 100644 index a0a3790..0000000 --- a/proton-c/bindings/python/PYZMQ_LICENSE.BSD +++ /dev/null @@ -1,32 +0,0 @@ -PyZMQ is licensed under the terms of the Modified BSD License (also known as -New or Revised BSD), as follows: - -Copyright (c) 2009-2012, Brian Granger, Min Ragan-Kelley - -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. http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/c1f9ed41/proton-c/bindings/python/setuputils/PYZMQ_LICENSE.BSD ---------------------------------------------------------------------- diff --git a/proton-c/bindings/python/setuputils/PYZMQ_LICENSE.BSD b/proton-c/bindings/python/setuputils/PYZMQ_LICENSE.BSD new file mode 100644 index 0000000..a0a3790 --- /dev/null +++ b/proton-c/bindings/python/setuputils/PYZMQ_LICENSE.BSD @@ -0,0 +1,32 @@ +PyZMQ is licensed under the terms of the Modified BSD License (also known as +New or Revised BSD), as follows: + +Copyright (c) 2009-2012, Brian Granger, Min Ragan-Kelley + +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. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
