This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository simplyhtml.
commit 61fca67096b4f045c2b6c4e5ea40384982ab7c33 Author: Markus Koschany <[email protected]> Date: Sun Sep 17 18:42:14 2017 +0200 Remove source/lintian-overrides and create a standalone license paragraph instead to comply with copyright format 1.0 syntax. --- debian/changelog | 2 ++ debian/copyright | 25 ++++--------------------- debian/source/lintian-overrides | 2 -- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index a52641a..16a1c39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ simplyhtml (0.17.3+dfsg1-1) unstable; urgency=medium [ Markus Koschany ] * Switch to compat level 10. * Declare compliance with Debian Policy 4.1.0. + * Create a standalone paragraph for the BSD-2-clause license to comply with + copyright format 1.0 syntax. -- Felix Natter <[email protected]> Sat, 16 Sep 2017 23:44:47 +0200 diff --git a/debian/copyright b/debian/copyright index cf2ec3b..1ccf1e4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -49,27 +49,12 @@ Copyright: 2006-2013 Dimitri Polivaev <[email protected]> 2006-2013 Christian Foltin License: GPL-2+ -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/> - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - Files: debian/* Copyright: 2013-2017 Felix Natter <[email protected]> 2008-2012 Eric Lavarde <[email protected]> License: GPL-2+ or BSD-2-clause + +License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -85,10 +70,8 @@ License: GPL-2+ or BSD-2-clause . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - . - . - For the "BSD-2-clause" option, here is the license text: - . + +License: BSD-2-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides deleted file mode 100644 index dcc0ed7..0000000 --- a/debian/source/lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -# this is a false positive, probably due to multiple license options -simplyhtml source: dep5-copyright-license-name-not-unique -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/simplyhtml.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
