This is an automated email from the git hooks/post-receive script. mans0954 pushed a commit to branch master in repository dropwizard-metrics.
commit e2f235a479a34e58a5b8e97b86dff6b18a6efb50 Author: Christopher Hoskin <[email protected]> Date: Sat Aug 12 07:33:56 2017 +0100 Correct Bootstrap license --- debian/changelog | 6 ++++++ debian/copyright | 26 +++++++------------------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7020d5f..ed479b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dropwizard-metrics (3.2.3-3) UNRELEASED; urgency=medium + + * Correct Bootstrap license + + -- Christopher Hoskin <[email protected]> Sat, 12 Aug 2017 07:33:18 +0100 + dropwizard-metrics (3.2.3-2) unstable; urgency=medium * Team upload. diff --git a/debian/copyright b/debian/copyright index 64d0666..a5d4698 100644 --- a/debian/copyright +++ b/debian/copyright @@ -21,7 +21,13 @@ License: BSD-2-clause Files: docs/source/_themes/metrics/less/* Copyright: 2012, Twitter, Inc -License: Expat +License: Apache-2.0 +Comment: Files in docs/source/_themes/metrics/less/ are as Bootstrap v2.0.0, + with very minor changes to code.less, mixins.less, tables.less and an + additional metrics.less. + . + Bootstrap was licensed as Apache-2.0 until v3.1 when it migrated to MIT + https://github.com/twbs/bootstrap/issues/2054 Files: metrics-annotation/src/main/java/com/codahale/metrics/annotation/Metric.java Copyright: 2012, Ryan W Tenney <[email protected]> @@ -69,21 +75,3 @@ License: BSD-2-clause (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 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. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dropwizard-metrics.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
