From bd6418893db1550c949526486a21f5a35bd2f7ba Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Fri, 16 Jul 2004 18:48:35 +0000 Subject: [PATCH] Bug 236613: change to MPL/LGPL/GPL tri-license. git-svn-id: svn://10.0.0.236/trunk@159356 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/base/public/nsIScriptElement.h | 53 +++++++++------ .../browser/webBrowser/nsEmbedStream.cpp | 50 +++++++++----- .../browser/webBrowser/nsEmbedStream.h | 50 +++++++++----- mozilla/extensions/access-builtin/Makefile.in | 12 ---- mozilla/extensions/access-builtin/README | 12 ---- .../access-builtin/accessproxy/Makefile.in | 12 ---- mozilla/extensions/typeaheadfind/Makefile.in | 12 ---- .../typeaheadfind/public/Makefile.in | 12 ---- .../typeaheadfind/resources/Makefile.in | 12 ---- .../extensions/typeaheadfind/src/Makefile.in | 12 ---- mozilla/gfx/src/ps/nsIPrintJobPS.h | 19 +++--- mozilla/gfx/src/ps/nsPrintJobFactoryPS.cpp | 19 +++--- mozilla/gfx/src/ps/nsPrintJobFactoryPS.h | 19 +++--- mozilla/gfx/src/ps/nsPrintJobPS.cpp | 19 +++--- mozilla/gfx/src/ps/nsPrintJobPS.h | 19 +++--- .../intl/chardet/tools/GenCyrillicClass.cpp | 57 ++++++++++------ mozilla/intl/chardet/tools/charfreqtostat.pl | 49 +++++++++----- mozilla/intl/lwbrk/tools/anzx4501.pl | 17 +++-- mozilla/intl/uconv/tools/cp936tocdx.pl | 49 +++++++++----- mozilla/intl/uconv/tools/genimpldefine.pl | 49 +++++++++----- mozilla/intl/uconv/tools/umaptable.c | 57 ++++++++++------ .../intl/unicharutil/tools/gencasetable.pl | 49 +++++++++----- mozilla/intl/unicharutil/tools/gencattable.pl | 49 +++++++++----- .../unicharutil/tools/gentransliterate.pl | 67 ++++++++++++------- mozilla/layout/tools/gensymmtable.pl | 51 +++++++++----- .../smimestub/nsSMIMEStubFactory.cpp | 26 +------ .../modules/plugin/base/src/nsJSNPRuntime.cpp | 18 ++--- .../modules/plugin/base/src/nsJSNPRuntime.h | 18 ++--- .../parser/htmlparser/tools/genentities.pl | 51 +++++++++----- mozilla/parser/htmlparser/tools/gentags.pl | 51 +++++++++----- 30 files changed, 557 insertions(+), 433 deletions(-) diff --git a/mozilla/content/base/public/nsIScriptElement.h b/mozilla/content/base/public/nsIScriptElement.h index a49d9fcf1ee..9a8fc65474a 100644 --- a/mozilla/content/base/public/nsIScriptElement.h +++ b/mozilla/content/base/public/nsIScriptElement.h @@ -1,25 +1,40 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* - * 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. - * +/* ***** 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 Mozilla. - * - * The Initial Developer of the Original Code is Netscape - * Communications. Portions created by Netscape Communications are - * Copyright (C) 2001 by Netscape Communications. All - * Rights Reserved. - * - * Contributor(s): + * + * The Initial Developer of the Original Code is + * Netscape Communications. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): * Vidur Apparao (original author) - */ + * + * 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 ***** */ #ifndef nsIScriptElement_h___ #define nsIScriptElement_h___ diff --git a/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp b/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp index 82486a0fa63..45223e43dc0 100644 --- a/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp +++ b/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp @@ -1,23 +1,39 @@ -/* - * 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. - * +/* ***** 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 mozilla.org code. - * - * The Initial Developer of the Original Code is Christopher Blizzard. - * Portions created by Christopher Blizzard are Copyright (C) - * Christopher Blizzard. All Rights Reserved. - * + * + * The Initial Developer of the Original Code is + * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard. All Rights Reserved. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * Christopher Blizzard - */ + * + * 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 ***** */ #include #include diff --git a/mozilla/embedding/browser/webBrowser/nsEmbedStream.h b/mozilla/embedding/browser/webBrowser/nsEmbedStream.h index b5112647e0c..be570249c22 100644 --- a/mozilla/embedding/browser/webBrowser/nsEmbedStream.h +++ b/mozilla/embedding/browser/webBrowser/nsEmbedStream.h @@ -1,23 +1,39 @@ -/* - * 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. - * +/* ***** 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 mozilla.org code. - * - * The Initial Developer of the Original Code is Christopher Blizzard. - * Portions created by Christopher Blizzard are Copyright (C) - * Christopher Blizzard. All Rights Reserved. - * + * + * The Initial Developer of the Original Code is + * Christopher Blizzard. Portions created by Christopher Blizzard are Copyright (C) Christopher Blizzard. All Rights Reserved. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * Christopher Blizzard - */ + * + * 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 ***** */ #include #include diff --git a/mozilla/extensions/access-builtin/Makefile.in b/mozilla/extensions/access-builtin/Makefile.in index 6cdc9d4450c..80f1e8f46eb 100644 --- a/mozilla/extensions/access-builtin/Makefile.in +++ b/mozilla/extensions/access-builtin/Makefile.in @@ -34,18 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ diff --git a/mozilla/extensions/access-builtin/README b/mozilla/extensions/access-builtin/README index 9226f21d6ee..1bead9845ea 100644 --- a/mozilla/extensions/access-builtin/README +++ b/mozilla/extensions/access-builtin/README @@ -34,18 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - This is the access-builtin module This module creates a preference in Mozilla for browsing with text-to-speech, and eventually diff --git a/mozilla/extensions/access-builtin/accessproxy/Makefile.in b/mozilla/extensions/access-builtin/accessproxy/Makefile.in index 175123916be..d52505bcf3a 100644 --- a/mozilla/extensions/access-builtin/accessproxy/Makefile.in +++ b/mozilla/extensions/access-builtin/accessproxy/Makefile.in @@ -35,18 +35,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ diff --git a/mozilla/extensions/typeaheadfind/Makefile.in b/mozilla/extensions/typeaheadfind/Makefile.in index 00f80d4bb30..87239dbe3ee 100644 --- a/mozilla/extensions/typeaheadfind/Makefile.in +++ b/mozilla/extensions/typeaheadfind/Makefile.in @@ -34,18 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ diff --git a/mozilla/extensions/typeaheadfind/public/Makefile.in b/mozilla/extensions/typeaheadfind/public/Makefile.in index 8b7b1e0858b..e3feaedddc7 100644 --- a/mozilla/extensions/typeaheadfind/public/Makefile.in +++ b/mozilla/extensions/typeaheadfind/public/Makefile.in @@ -34,18 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ diff --git a/mozilla/extensions/typeaheadfind/resources/Makefile.in b/mozilla/extensions/typeaheadfind/resources/Makefile.in index 2e790b6d79e..ab74943a07d 100644 --- a/mozilla/extensions/typeaheadfind/resources/Makefile.in +++ b/mozilla/extensions/typeaheadfind/resources/Makefile.in @@ -34,18 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ diff --git a/mozilla/extensions/typeaheadfind/src/Makefile.in b/mozilla/extensions/typeaheadfind/src/Makefile.in index e693b39619f..d4152a379c4 100644 --- a/mozilla/extensions/typeaheadfind/src/Makefile.in +++ b/mozilla/extensions/typeaheadfind/src/Makefile.in @@ -34,18 +34,6 @@ # # ***** END LICENSE BLOCK ***** -# Alternatively, the contents of this file may be used under the terms -# of the GNU General Public License (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. - -# Contributor(s): - DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ diff --git a/mozilla/gfx/src/ps/nsIPrintJobPS.h b/mozilla/gfx/src/ps/nsIPrintJobPS.h index 82856208a47..b0bfd81c3e3 100644 --- a/mozilla/gfx/src/ps/nsIPrintJobPS.h +++ b/mozilla/gfx/src/ps/nsIPrintJobPS.h @@ -1,12 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -15,25 +15,24 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is - * Ken Herron + * The Initial Developer of the Original Code is + * Ken Herron . * Portions created by the Initial Developer are Copyright (C) 2004 * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/gfx/src/ps/nsPrintJobFactoryPS.cpp b/mozilla/gfx/src/ps/nsPrintJobFactoryPS.cpp index cd103ac05f5..79f61b62577 100644 --- a/mozilla/gfx/src/ps/nsPrintJobFactoryPS.cpp +++ b/mozilla/gfx/src/ps/nsPrintJobFactoryPS.cpp @@ -1,12 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -15,25 +15,24 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is - * Kenneth Herron + * The Initial Developer of the Original Code is + * Kenneth Herron . * Portions created by the Initial Developer are Copyright (C) 2004 * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/gfx/src/ps/nsPrintJobFactoryPS.h b/mozilla/gfx/src/ps/nsPrintJobFactoryPS.h index 1b3085b03f3..74f25099c00 100644 --- a/mozilla/gfx/src/ps/nsPrintJobFactoryPS.h +++ b/mozilla/gfx/src/ps/nsPrintJobFactoryPS.h @@ -1,12 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -15,25 +15,24 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is - * Kenneth Herron + * The Initial Developer of the Original Code is + * Kenneth Herron . * Portions created by the Initial Developer are Copyright (C) 2004 * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/gfx/src/ps/nsPrintJobPS.cpp b/mozilla/gfx/src/ps/nsPrintJobPS.cpp index 4b51259a1ac..e6fc3f0ce41 100644 --- a/mozilla/gfx/src/ps/nsPrintJobPS.cpp +++ b/mozilla/gfx/src/ps/nsPrintJobPS.cpp @@ -1,12 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -15,25 +15,24 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is - * Ken Herron + * The Initial Developer of the Original Code is + * Ken Herron . * Portions created by the Initial Developer are Copyright (C) 2004 * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/gfx/src/ps/nsPrintJobPS.h b/mozilla/gfx/src/ps/nsPrintJobPS.h index 38a41b3d514..27db8f3d4a7 100644 --- a/mozilla/gfx/src/ps/nsPrintJobPS.h +++ b/mozilla/gfx/src/ps/nsPrintJobPS.h @@ -1,12 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -15,25 +15,24 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is - * Ken Herron + * The Initial Developer of the Original Code is + * Ken Herron . * Portions created by the Initial Developer are Copyright (C) 2004 * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/intl/chardet/tools/GenCyrillicClass.cpp b/mozilla/intl/chardet/tools/GenCyrillicClass.cpp index f2d97d3e55f..97d77b0f2c2 100644 --- a/mozilla/intl/chardet/tools/GenCyrillicClass.cpp +++ b/mozilla/intl/chardet/tools/GenCyrillicClass.cpp @@ -23,8 +23,8 @@ * Pierre Phaneuf * * Alternatively, the contents of this file may be used under the terms of - * either of 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"), + * 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 @@ -72,23 +72,42 @@ void footer() void npl() { char *npl= -"/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-\n" -"*\n" -"* The contents of this file are subject to the Netscape Public License\n" -"* Version 1.0 (the \"NPL\"); you may not use this file except in\n" -"* compliance with the NPL. You may obtain a copy of the NPL at\n" -"* http://www.mozilla.org/NPL/\n" -"*\n" -"* Software distributed under the NPL is distributed on an \"AS IS\" basis,\n" -"* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL\n" -"* for the specific language governing rights and limitations under the\n" -"* NPL.\n" -"*\n" -"* The Initial Developer of this code under the NPL is Netscape\n" -"* Communications Corporation. Portions created by Netscape are\n" -"* Copyright (C) 1998 Netscape Communications Corporation. All Rights\n" -"* Reserved.\n" -"*/\n"; +"/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */\n" +"/* ***** BEGIN LICENSE BLOCK *****\n" +" * Version: MPL 1.1/GPL 2.0/LGPL 2.1\n" +" *\n" +" * The contents of this file are subject to the Mozilla Public License Version\n" +" * 1.1 (the \"License\"); you may not use this file except in compliance with\n" +" * the License. You may obtain a copy of the License at\n" +" * http://www.mozilla.org/MPL/\n" +" *\n" +" * Software distributed under the License is distributed on an \"AS IS\" basis,\n" +" * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License\n" +" * for the specific language governing rights and limitations under the\n" +" * License.\n" +" *\n" +" * The Original Code is mozilla.org code.\n" +" *\n" +" * The Initial Developer of the Original Code is\n" +" * Netscape Communications Corporation.\n" +" * Portions created by the Initial Developer are Copyright (C) 2001\n" +" * the Initial Developer. All Rights Reserved.\n" +" *\n" +" * Contributor(s):\n" +" *\n" +" * Alternatively, the contents of this file may be used under the terms of\n" +" * either the GNU General Public License Version 2 or later (the \"GPL\"), or\n" +" * the GNU Lesser General Public License Version 2.1 or later (the \"LGPL\"),\n" +" * in which case the provisions of the GPL or the LGPL are applicable instead\n" +" * of those above. If you wish to allow use of your version of this file only\n" +" * under the terms of either the GPL or the LGPL, and not to allow others to\n" +" * use your version of this file under the terms of the MPL, indicate your\n" +" * decision by deleting the provisions above and replace them with the notice\n" +" * and other provisions required by the GPL or the LGPL. If you do not delete\n" +" * the provisions above, a recipient may use your version of this file under\n" +" * the terms of any one of the MPL, the GPL or the LGPL.\n" +" *\n" +" * ***** END LICENSE BLOCK ***** */\n"; printf(npl); } //--------------------------------------------------------------------------- diff --git a/mozilla/intl/chardet/tools/charfreqtostat.pl b/mozilla/intl/chardet/tools/charfreqtostat.pl index 8cc881f3b47..a3935961263 100644 --- a/mozilla/intl/chardet/tools/charfreqtostat.pl +++ b/mozilla/intl/chardet/tools/charfreqtostat.pl @@ -23,8 +23,8 @@ # Contributor(s): # # Alternatively, the contents of this file may be used under the terms of -# either of 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"), +# 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 @@ -37,27 +37,42 @@ # ***** END LICENSE BLOCK ***** sub GenNPL { my($ret) = << "END_NPL"; -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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. + * 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 mozilla.org code. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. * - * Contributor(s): - */ + * 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 ***** */ END_NPL return $ret; diff --git a/mozilla/intl/lwbrk/tools/anzx4501.pl b/mozilla/intl/lwbrk/tools/anzx4501.pl index 86103610bf6..743d38cf8c3 100644 --- a/mozilla/intl/lwbrk/tools/anzx4501.pl +++ b/mozilla/intl/lwbrk/tools/anzx4501.pl @@ -112,12 +112,12 @@ print OUT $hthmlheader; $npl = < ../src/casetable.h") # ###################################################################### $npl = < ../src/cattable.h") # ###################################################################### $npl = < ../base/src/symmtable.h") || die "cannot open output ../base/src/symmtable.h file"; $npl = < * * Alternatively, the contents of this file may be used under the terms of - * either of 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"), + * 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 @@ -36,28 +36,6 @@ * * ***** END LICENSE BLOCK ***** */ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 mozilla.org code. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ - #include "nsIGenericFactory.h" /* Include all of the interfaces our factory can generate components for */ diff --git a/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp b/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp index 158af4e8ae1..fb67a4c7734 100644 --- a/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp +++ b/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -14,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. @@ -22,16 +22,16 @@ * 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 + * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/modules/plugin/base/src/nsJSNPRuntime.h b/mozilla/modules/plugin/base/src/nsJSNPRuntime.h index bd65d3e7069..0d9ee6daf8b 100644 --- a/mozilla/modules/plugin/base/src/nsJSNPRuntime.h +++ b/mozilla/modules/plugin/base/src/nsJSNPRuntime.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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 @@ -14,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 1998 * the Initial Developer. All Rights Reserved. @@ -22,16 +22,16 @@ * 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 + * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ diff --git a/mozilla/parser/htmlparser/tools/genentities.pl b/mozilla/parser/htmlparser/tools/genentities.pl index 7df66ac7b01..141fed2a33a 100644 --- a/mozilla/parser/htmlparser/tools/genentities.pl +++ b/mozilla/parser/htmlparser/tools/genentities.pl @@ -23,8 +23,8 @@ # Contributor(s): # # Alternatively, the contents of this file may be used under the terms of -# either of 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"), +# 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 @@ -313,27 +313,46 @@ $entity[$i++] = "REG"; $value{"REG"} = "174"; # Sort the entity table before using it @entity = sort @entity; -$copyright = "/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +$copyright = <