This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository doxia.
commit d8ae42ce3e3c920778b220242f65077ed3dcf6b8 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 12:00:38 2017 +0200 Converted debian/copyright to the Copyright Format 1.0 --- debian/changelog | 1 + debian/copyright | 93 ++++++++++++++------------------------------------------ 2 files changed, 23 insertions(+), 71 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e5ec25..f4064cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ doxia (1.7-1) UNRELEASED; urgency=medium * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 * Use XZ compression for the upstream tarball + * Converted debian/copyright to the Copyright Format 1.0 -- Emmanuel Bourg <[email protected]> Thu, 27 Jul 2017 13:59:31 +0200 diff --git a/debian/copyright b/debian/copyright index a220909..2547f48 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,71 +1,22 @@ -This package was debianized by - Trygve Laugstol <[email protected]> - Paul Cager <[email protected]> - -The Debian packaging is Copyright (c) 2007 Trygve Laugstol and is licensed under -the GNU General Public License version 2. On Debian systems, the complete text -of the GNU General Public License version 2 can be found in -'/usr/share/common-licenses/GPL-2'. - - -Doxia was downloaded from - http://maven.apache.org/doxia/ - -Upstream Authors: - The Apache Software Foundation - Brett Porter <[email protected]> - Emmanuel Venisse <[email protected]> - James Taylor <[email protected]> - Lars Trieloff <[email protected]> - Vincent Siveton <[email protected]> - Juan F. Codagnone - Rod Johnson - - -Copyright: - Copyright (C) 2002-2005 The Apache Software Foundation. - Copyright (C) 2005 Juan F. Codagnone <juam at users dot sourceforge dot net> - Copyright (C) 2005 Zauber <info /at/ zauber dot com dot ar> - -License: - A number of source files in this package have missing or invalid - license declarations. Upstream have fixed this in their SVN, and the - situation discussed in - http://lists.debian.org/debian-devel/2007/07/msg00042.html - The consensus was that it should not prevent the package - entering Debian. - - The source files in question are: - - - These files have no copyright statement or license declaration: - doxia-sink-api/src/main/java/org/codehaus/doxia/sink/Sink.java - doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/table/TableRowBlock.java - doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlock.java - doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineReaderSource.java - doxia-core/src/main/java/org/apache/maven/doxia/module/common/ByLineSource.java - - - These files have "Copyright (c) 2005 Your Corporation. All Rights - Reserved" with no license declaration: - doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/SectionBlockParser.java - doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlock.java - doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/VerbatimBlockParser.java - doxia-core/src/main/java/org/apache/maven/doxia/module/confluence/parser/TextBlock.java - - Otherwise the following license declaration is made: - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -On Debian systems, the complete text of the Apache License -version 2.0 can be found in /usr/share/common-licenses/Apache-2.0 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Maven Doxia +Source: http://svn.apache.org/repos/asf/maven/doxia/doxia/ + +Files: * +Copyright: 2006-2016, The Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: 2007, Trygve Laugstøl <[email protected]> + 2007, Paul Cager <[email protected]> + 2008-2011, Torsten Werner <[email protected]> + 2009, Ludovic Claude <[email protected]> + 2009, Michael Koch <[email protected]> + 2010-2011, Gabriele Giacone <[email protected]> + 2012, Miguel Landaeta <[email protected]> + 2015-2017, Emmanuel Bourg <[email protected]> +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' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
