This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository jffi.
commit e98e53aab701d57c8f2b0e13d8ec58a7e43447d9 Author: Markus Koschany <[email protected]> Date: Wed Nov 18 16:25:41 2015 +0100 Fix duplicate copyright paragraph for Debian files. --- debian/changelog | 2 ++ debian/copyright | 19 +------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65fc047..5c8c3ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ jffi (1.2.7-7) unstable; urgency=medium * Fix Lintian warning dep5-copyright-license-name-not-unique. * d/rules: export CCACHE_DIR=$(CURDIR)/ccache and fix FTBFS due to otherwise nonexistent home directory. + * Fix duplicate copyright paragraph for debian files. Use a more permissive + license and do not make it difficult to apply Debian patches upstream. -- Markus Koschany <[email protected]> Wed, 18 Nov 2015 16:04:04 +0100 diff --git a/debian/copyright b/debian/copyright index f7a8c53..fd0db16 100644 --- a/debian/copyright +++ b/debian/copyright @@ -93,6 +93,7 @@ License: BSD-3-clause-Meissner Files: debian/* Copyright: 2010 Torsten Werner <[email protected]> + 2014 Tim Potter <[email protected]> License: BSD-3-clause-Debian Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -118,21 +119,3 @@ License: BSD-3-clause-Debian OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: debian/* -Copyright: 2014 Tim Potter <[email protected]> -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". -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
