This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjfx.
commit 937b2656a898d63f0f640c14f2da0f81585f5b2c Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 18 17:03:20 2014 +0200 Updated debian/copyright --- debian/changelog | 3 +++ debian/copyright | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9205a2a..e33f8c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ openjfx (8u20-b26-1) UNRELEASED; urgency=medium * debian/rules: Updated the path to the SDK generated during the build * Removed the timestamp in the gzipped man pages * Standards-Version updated to 3.9.6 (no changes) + * debian/copyright: + - Removed the spaces in the licenses short names + - Updated the license information for the examples under apps/experiments/ -- Emmanuel Bourg <[email protected]> Thu, 18 Sep 2014 14:22:30 +0200 diff --git a/debian/copyright b/debian/copyright index 0c39d1d..41c47d3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,14 +6,15 @@ Files: * Copyright: 2014, Oracle Inc. License: GPL-2 with Classpath exception -Files: apps/experiments/3DViewer/* - apps/experiments/ConferenceScheduleApp/* - apps/experiments/Modena/* +Files: apps/experiments/ConferenceScheduleApp/* + apps/experiments/ModenaTest/* + apps/experiments/PtyConsole/* + apps/experiments/WebTerminal/* apps/performance/GraphicsPerformance/* apps/scenebuilder/* tests/golden-image-suite/* Copyright: 2008-2014, Oracle Inc. -License: BSD 3-clause +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -81,7 +82,7 @@ Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 2010 Collabora Multimedia 2010 Fluendo S.A. <[email protected]> 2011-2013, Oracle -License: LGPL-2 or later +License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either @@ -97,7 +98,7 @@ License: LGPL-2 or later Files: modules/web/src/main/native/* Copyright: 1995-2013, various contributors -License: LGPL-2 or later, BSD-2-clause and BSD-3-clause +License: LGPL-2+ or BSD-2-clause or BSD-3-clause This is an embedded copy of the WebKit rendering engine, please see the debian/copyright file of the webkitgtk or qtwebkit packages for a detailed list of the copyright holders and the applicable licenses. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
