This is an automated email from the git hooks/post-receive script. mans0954 pushed a commit to branch master in repository apache-directory-api.
commit c209d18c7783ce3563086519d2fb3e43a9ca135b Author: Christopher Hoskin <mans0...@debian.org> Date: Fri Jan 26 21:46:44 2018 +0000 Update debian/copyright --- debian/changelog | 3 +- debian/copyright | 64 ++++++++++++++++++++++++++++++----------- debian/source/lintian-overrides | 2 ++ 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb865bf..f907a08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apache-directory-api (1.0.0-1) UNRELEASED; urgency=medium * Team upload. - * Watch official signed upstream release tarballs + * Watch official signed upstream release tarballs * New upstream release (1.0.0) * Use https in debian/watch * Remove 02-CVE-2015-3250.patch (fixed in M31) @@ -10,6 +10,7 @@ apache-directory-api (1.0.0-1) UNRELEASED; urgency=medium * debian/maven.ignoreRules * debian/maven.rules * Comment out ignore rules which can be ignored + * Update debian/copyright -- Christopher Hoskin <mans0...@debian.org> Wed, 03 Jan 2018 23:33:47 +0000 diff --git a/debian/copyright b/debian/copyright index 4350f08..102fd28 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,24 +1,48 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Apache Directory LDAP API Source: http://svn.apache.org/repos/asf/directory/shared/trunk Files: * -Copyright: 2003-2013, The Apache Software Foundation +Copyright: 2003-2017, The Apache Software Foundation License: Apache-2.0 -Files: util/src/main/java/org/apache/directory/api/util/UnixCrypt.java -Copyright: 1996, Aki Yoshida - 2001, Iris Van den Broeke, Daniel Deville -License: other - Permission to use, copy, modify and distribute this software - for non-commercial or commercial purposes and without fee is - hereby granted provided that this copyright notice appears in - all copies. - Files: ldap/model/src/test/resources/org/apache/directory/api/ldap/model/schema/parsers/* Copyright: 1998-2007, The OpenLDAP Foundation 1997-2003, The Internet Society License: BSD-3-clause + +Files: ldap/model/src/test/resources/org/apache/directory/api/ldap/model/schema/parsers/core.schema +Copyright: 1998-2007, The OpenLDAP Foundation + 1997-2003, The Internet Society +License: BSD-3-clause +Comment: The file contains the statement: + The version of this file as distributed by the OpenLDAP Foundation + contains text claiming copyright by the Internet Society and including + the IETF RFC license, which does not meet Debian's Free Software + Guidelines. However, apart from short and obvious comments, the text of + this file is purely a functional interface specification, which is not + subject to that license and is not copyrightable under US law. + . + The license statement is retained below so as not to remove credit, but + as best as we can determine, it is not applicable to the contents of + this file. + + +Files: ldap/model/src/main/java/org/apache/directory/api/ldap/model/password/BCrypt.java +Copyright: 2006, Damien Miller <d...@mindrot.org> +License: ISC + + + +Files: debian/* +Copyright: 2015, Emmanuel Bourg <ebo...@apache.org> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' + +License: BSD-3-clause Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: @@ -58,10 +82,16 @@ License: BSD-3-clause to copyright in this Software shall at all times remain with copyright holders. -Files: debian/* -Copyright: 2015, Emmanuel Bourg <ebo...@apache.org> -License: Apache-2.0 +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -License: Apache-2.0 - On Debian systems, the full text of the Apache-2.0 license - can be found in the file '/usr/share/common-licenses/Apache-2.0' diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..957e123 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# See the comment in debian/copyright +apache-directory-api source: license-problem-non-free-RFC ldap/model/src/test/resources/org/apache/directory/api/ldap/model/schema/parsers/core.schema -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-directory-api.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits