From e2e3d5d1c76b3744afcda5f3d21dc685a724afe7 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Thu, 28 Jun 2007 20:03:09 +0000 Subject: [PATCH] Bug 236613: change to MPL/LGPL/GPL tri-license. git-svn-id: svn://10.0.0.236/trunk@228965 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/unicharutil/util/bidicattable.h | 42 ++++++++++++---- .../intl/unicharutil/util/genbidicattable.pl | 42 +++++++++++----- mozilla/intl/unicharutil/util/gensymmtable.pl | 43 +++++++++++----- mozilla/intl/unicharutil/util/nsBidiUtils.cpp | 40 ++++++++++----- mozilla/intl/unicharutil/util/nsBidiUtils.h | 40 ++++++++++----- mozilla/intl/unicharutil/util/symmtable.h | 50 +++++++++++++------ 6 files changed, 179 insertions(+), 78 deletions(-) diff --git a/mozilla/intl/unicharutil/util/bidicattable.h b/mozilla/intl/unicharutil/util/bidicattable.h index 424958bc501..3718c0c1836 100644 --- a/mozilla/intl/unicharutil/util/bidicattable.h +++ b/mozilla/intl/unicharutil/util/bidicattable.h @@ -1,20 +1,40 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "MPL"); you may not use this file except in - * compliance with the MPL. You may obtain a copy of the MPL at + * ***** 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 MPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the 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 - * MPL. + * License. * - * The Initial Developer of the Original Code is IBM - * Corporation. Portions created by IBM are - * Copyright (C) 2000 IBM Corporation. All - * Rights Reserved. - */ + * The Original Code is mozilla.org Code. + * + * The Initial Developer of the Original Code is + * IBM Corporation. + * Portions created by the Initial Developer are Copyright (C) 2000 + * the Initial Developer. All Rights Reserved. + * + * 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"), + * 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 ***** */ /* DO NOT EDIT THIS DOCUMENT !!! THIS DOCUMENT IS GENERATED BY mozilla/layout/tools/genbidicattable.pl diff --git a/mozilla/intl/unicharutil/util/genbidicattable.pl b/mozilla/intl/unicharutil/util/genbidicattable.pl index d8ccf1eafd7..571419bc005 100644 --- a/mozilla/intl/unicharutil/util/genbidicattable.pl +++ b/mozilla/intl/unicharutil/util/genbidicattable.pl @@ -1,24 +1,40 @@ #!/usr/local/bin/perl # -# 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/ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 # -# 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 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 IBM -# Corporation. Portions created by IBM are -# Copyright (C) 2000 IBM Corporation. All -# Rights Reserved. +# The Initial Developer of the Original Code is +# IBM Corporation. +# Portions created by the Initial Developer are Copyright (C) 2000 +# the Initial Developer. All Rights Reserved. # -# Contributor(s): +# 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"), +# 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 ***** ###################################################################### # diff --git a/mozilla/intl/unicharutil/util/gensymmtable.pl b/mozilla/intl/unicharutil/util/gensymmtable.pl index 63fdf0731e9..0f6f485d9ff 100644 --- a/mozilla/intl/unicharutil/util/gensymmtable.pl +++ b/mozilla/intl/unicharutil/util/gensymmtable.pl @@ -1,24 +1,41 @@ #!/usr/local/bin/perl # -# 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/ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 # -# 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 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 IBM code. # -# The Initial Developer of the Original Code is IBM. -# Portions created by IBM are -# Copyright (C) International Business Machines -# Corporation, 2000. All Rights Reserved. +# The Initial Developer of the Original Code is +# IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000. All Rights Reserved. +# Portions created by the Initial Developer are Copyright (C) 2001 +# the Initial Developer. All Rights Reserved. # -# Contributor(s): Simon Montagu +# Contributor(s): +# Simon Montagu # +# 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"), +# 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 ***** # This program generates the header file symmtable.h from the Unicode # informative data file BidiMirroring.txt. diff --git a/mozilla/intl/unicharutil/util/nsBidiUtils.cpp b/mozilla/intl/unicharutil/util/nsBidiUtils.cpp index d7320a361cb..e2e428307df 100644 --- a/mozilla/intl/unicharutil/util/nsBidiUtils.cpp +++ b/mozilla/intl/unicharutil/util/nsBidiUtils.cpp @@ -1,28 +1,44 @@ /* -*- 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/ + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * 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 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 - * IBM Corporation. Portions created by IBM are - * Copyright (C) 2000 IBM Corporation. All - * Rights Reserved. + * IBM Corporation. + * Portions created by the Initial Developer are Copyright (C) 2000 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * Maha Abou El Rous * Lina Kemmel * Simon Montagu * Roozbeh Pournader - */ + * + * 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"), + * 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 "nsBidiUtils.h" #define FE_TO_06_OFFSET 0xfe70 diff --git a/mozilla/intl/unicharutil/util/nsBidiUtils.h b/mozilla/intl/unicharutil/util/nsBidiUtils.h index 78077494dcb..1cb135f6127 100644 --- a/mozilla/intl/unicharutil/util/nsBidiUtils.h +++ b/mozilla/intl/unicharutil/util/nsBidiUtils.h @@ -1,28 +1,42 @@ /* -*- 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/ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * 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 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 - * IBM Corporation. Portions created by IBM are - * Copyright (C) 2000 IBM Corporation. All - * Rights Reserved. + * IBM Corporation. + * Portions created by the Initial Developer are Copyright (C) 2000 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * Maha Abou El Rous * Lina Kemmel * Simon Montagu * - */ + * 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"), + * 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 nsBidiUtils_h__ #define nsBidiUtils_h__ diff --git a/mozilla/intl/unicharutil/util/symmtable.h b/mozilla/intl/unicharutil/util/symmtable.h index 31ad6ac7bbf..3f4693973a2 100644 --- a/mozilla/intl/unicharutil/util/symmtable.h +++ b/mozilla/intl/unicharutil/util/symmtable.h @@ -1,22 +1,40 @@ /* -*- Mode: C; tab-width: 4; 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 IBM code. - * - * The Initial Developer of the Original Code is IBM. - * Portions created by IBM are - * Copyright (C) International Business Machines - * Corporation, 2000. All Rights Reserved. - */ + * + * The Initial Developer of the Original Code is + * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000. All Rights Reserved. /. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * 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"), + * 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 ***** */ /* DO NOT EDIT THIS DOCUMENT !!! THIS DOCUMENT IS GENERATED BY mozilla/intl/unicharutil/tools/gensymmtable.pl