From faa351ca9c5ad1d7c2d37a58463ac6a079ff2883 Mon Sep 17 00:00:00 2001 From: Michael Shuler Date: Thu, 21 Jun 2012 10:02:21 -0500 Subject: [PATCH] Update mozilla/certdata.txt to version 1.83 Mozilla Public License updated to v2.0 (No certificates added/removed.) Update debian/copyright to reflect MPL v2.0 --- debian/changelog | 9 ++++++--- debian/copyright | 37 ++++--------------------------------- mozilla/certdata.txt | 40 ++++------------------------------------ 3 files changed, 14 insertions(+), 72 deletions(-) diff --git a/debian/changelog b/debian/changelog index e068eef..0bb9627 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -ca-certificates (20120212.3) UNRELEASED; urgency=low +ca-certificates (20120621) UNRELEASED; urgency=low * Add Polish translation, thanks to Michał Kułach. Closes: #660002 * Add Turkish translation, thanks to Atila KOÇ. Closes: #661785 - * Update mozilla/certdata.txt to version 1.82 + * Update mozilla/certdata.txt to version 1.83 + Mozilla Public License updated to v2.0 (No certificates added/removed.) + * Update debian/copyright to reflect MPL v2.0 + * TODO: update NEWS with previous cert adds/removes - -- Michael Shuler Sun, 04 Mar 2012 09:52:09 -0600 + -- Michael Shuler Sun, 21 Jun 2012 09:59:19 -0600 ca-certificates (20120212) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 5318b43..6ea6682 100644 --- a/debian/copyright +++ b/debian/copyright @@ -31,38 +31,9 @@ mozilla/certdata2pem.py: (based on a Ruby script by Fumitoshi UKAI) Licensed under the same license as sbin/update-ca-certificates. -CA certificates from Mozilla as follows: -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (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.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. +mozilla/certdata.txt: -On Debian GNU/Linux systems, the complete text of the GNU General Public -License can be found in '/usr/share/common-licenses/GPL'. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/mozilla/certdata.txt b/mozilla/certdata.txt index 69209b1..68490fd 100644 --- a/mozilla/certdata.txt +++ b/mozilla/certdata.txt @@ -1,40 +1,8 @@ # -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (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.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1994-2000 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.82 $ $Date: 2012/02/18 21:41:46 $" +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.83 $ $Date: 2012/04/25 14:49:29 $" # # certdata.txt -- 2.39.2