From: Thomas Goirand Date: Fri, 3 Oct 2014 04:57:28 +0000 (+0000) Subject: Fixed upstream files gone in debian/copyright. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0c9173e2227ccf645aa04d128b1d880f62d1b2e2;p=openstack-build%2Fceilometer-build.git Fixed upstream files gone in debian/copyright. Rewritten-From: cd1c6597d83f37404b7d5f2078906ff07f1534df --- diff --git a/trusty/debian/changelog b/trusty/debian/changelog index d5d6c9b..4a213e9 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -4,6 +4,7 @@ ceilometer (2014.2~rc1-2) experimental; urgency=medium * Now packaging ceilometer-agent-ipmi. * Using templated init, upstart and systemd scripts from openstack-pkg-tools >= 13. + * Fixed upstream files gone in debian/copyright. -- Thomas Goirand Fri, 03 Oct 2014 00:30:58 +0800 diff --git a/trusty/debian/copyright b/trusty/debian/copyright index 703310c..8650299 100644 --- a/trusty/debian/copyright +++ b/trusty/debian/copyright @@ -17,78 +17,6 @@ Copyright: 2012 New Dream Network, LLC (DreamHost) 2012 Nicolas Barcet for Canonical License: Apache-2 -Files: ceilometer/api/static/d3.v2.min.js -Copyright: (c) 2012, Michael Bostock -License: BSD-3-clauses - -Files: ceilometer/api/v1/static/rickshaw.* -Copyright: (c) 2005-2010 Sam Stephenson -License: MIT-rickshaw - -Files: ceilometer/api/v1/static/jquery-1.8.3.js -Copyright: (c) 2012, jQuery Foundation and other contributors -License: MIT-jquery - -License: MIT-jquery - 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: MIT-rickshaw - 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 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: BSD-3-clauses - 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. - . - * The name Michael Bostock may not 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 MICHAEL BOSTOCK 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: Apache-2 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.