This is an automated email from the git hooks/post-receive script. matthew pushed a commit to branch master in repository libowasp-antisamy-java.
commit c03765df3801f62ea0bcc6b75d43b2fbce8ab719 Author: Matthew Vernon <[email protected]> Date: Mon Jun 2 18:00:37 2014 +0100 Move license text into copyright file Previously, we referred to the BSD license file in /usr/share/common-licenses/BSD. This is deprecated, so we don't do that any more. Also, I re-licensed my changes to this package to a permissive licence. --- debian/changelog | 7 +++++++ debian/copyright | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f78a936..0e678fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libowasp-antisamy-java (1.5.3+dfsg-2) unstable; urgency=low + + * Update copyright file to contain BSD licence rather than refer to the + copy in common-licenses (fixes a lintian warning) + + -- + libowasp-antisamy-java (1.5.3+dfsg-1) unstable; urgency=low * Remove src/test/resources/s from source tarball, as not distributable diff --git a/debian/copyright b/debian/copyright index 5581ae0..a3acbb3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,13 +5,40 @@ Source: https://code.google.com/p/owaspantisamy/ Files: * Copyright: 2014, Arshan Dabirsiaghi License: BSD + Copyright (c) 2007-2011, Arshan Dabirsiaghi, Jason Li + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modificati , are permitted provided that the following conditions are + met: + . + Redistributions of source code must retain the above copyright + notice, this l t of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright +notice, thi list of conditions and the following disclaimer in the +documentation and/or ot r materials provided with the distribution. + . + Neither the name of OWASP 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. Files: debian/* Copyright: 2014, Matthew Vernon <[email protected]> -License: BSD - -License: BSD - On Debian systems, the full text of the BSD license can - be found in the file '/usr/share/common-licenses/BSD' - - +License: permissive + Copying and distribution of this package, with or without + modification, are permitted in any medium without royalty + provided the copyright notice and this notice are + preserved. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libowasp-antisamy-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
