This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository snakeyaml.
commit bd4a1a44a70a8481c2f32cf760606e743c8baa4c Author: Emmanuel Bourg <[email protected]> Date: Sat Apr 9 00:39:34 2016 +0200 Fixed the short name of the BSD license in debian/copyright --- debian/changelog | 1 + debian/copyright | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dbd06a7..adf12ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ snakeyaml (1.17-1) UNRELEASED; urgency=medium - The package is now co-maintained with the Java Team * Standards-Version updated to 3.9.8 (no changes) * Updated debian/watch to track the release tags on Bitbucket + * Fixed the short name of the BSD license in debian/copyright -- Emmanuel Bourg <[email protected]> Sat, 09 Apr 2016 00:19:41 +0200 diff --git a/debian/copyright b/debian/copyright index 592fed3..259f3bd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ License: Apache-2.0 Files: src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java Copyright: 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland -License: EPL-1.0 or LGPL-2.1 or GPL-2 or Apache-2.0 or BSD +License: EPL-1.0 or LGPL-2.1 or GPL-2 or Apache-2.0 or BSD-3-clause Files: src/main/java/org/yaml/snakeyaml/external/com/* Copyright: 2008 Google Inc. @@ -290,7 +290,7 @@ License: GPL-2 On Debian systems, the complete text of the GPL version 2 license can be found in "/usr/share/common-licenses/LGPL-2". -License: BSD +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/snakeyaml.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
