This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ca-certificates-java.
commit df39bc2c82a6805efb2a3ed546a5b22187c9cba5 Author: Torsten Werner <[email protected]> Date: Mon Apr 25 13:16:59 2011 +0000 Update copyright and license. --- UpdateCertificates.java | 17 +++++++++-------- debian/copyright | 11 +++++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/UpdateCertificates.java b/UpdateCertificates.java index 0eba075..7bce46a 100644 --- a/UpdateCertificates.java +++ b/UpdateCertificates.java @@ -5,18 +5,19 @@ * http://gitorious.org/opensuse/ca-certificates/blobs/master/keystore.java * for the Debian operating system. It updates the global JVM keystore. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * + * This program 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 program 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, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ diff --git a/debian/copyright b/debian/copyright index 6e0de7d..7dfc120 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,15 +1,18 @@ This package was debianized by Matthias Klose <[email protected]> on Mon, 02 Jun 2008 14:52:46 +0000. -Upstream Author: +Authors: Matthias Klose <[email protected]> + Torsten Werner <[email protected]> Copyright: - <Copyright (C) 2008 Canonical Ltd> + Copyright (C) 2008 Canonical Ltd + Copyright (C) 2011 Torsten Werner <[email protected]> License: -The Debian package is (C) 2008, Canonical Ltd and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian package is (C) 2008, Canonical Ltd and (C) 2011, Torsten Werner +<[email protected]> and is licensed under the GPL, see +`/usr/share/common-licenses/GPL'. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
