X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fcopyright;h=86502996461ae1c8f411835d05a1cc7effb2ac65;hb=0c9173e2227ccf645aa04d128b1d880f62d1b2e2;hp=8ca8a95f01eb1ba7bf41c522087bb10096c48a97;hpb=ecd1bd684b02e9a2fe9730e1d601b46b0e23a74d;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 8ca8a95..8650299 100644
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ceilometer
-Upstream-Contact: Julien Danjou <acid@debian.org>, 
+Upstream-Contact: Julien Danjou <acid@debian.org>,
 Source: https://github.com/stackforge/ceilometer
 
 Files: debian/*
@@ -9,41 +9,14 @@ License: Apache-2
 
 Files: *
 Copyright: 2012 New Dream Network, LLC (DreamHost)
-           2012 eNovance 
+           2012 eNovance
            2012 Red Hat Inc.
-           2010 United States Government 
+           2010 United States Government
            2011 Cloudscaling Group, Inc
            2011 OpenStack LLC.
            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
- 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.