From fe2a998bfe82513f5ab5a8dc9d373d57c9c68ec5 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 11 Jan 2012 23:41:51 +0100 Subject: Bug 680131: Replace the MPL 1.1 license by the MPL 2.0 one in all files, and add it to files which miss one r=kiko r=mkanat r=mrbball a=LpSolit --- extensions/Example/Config.pm | 24 +++++---------------- extensions/Example/Extension.pm | 25 +++++----------------- extensions/Example/lib/Auth/Login.pm | 23 +++++--------------- extensions/Example/lib/Auth/Verify.pm | 23 +++++--------------- extensions/Example/lib/Config.pm | 24 +++++---------------- extensions/Example/lib/Util.pm | 23 +++++--------------- extensions/Example/lib/WebService.pm | 23 +++++--------------- .../en/default/account/prefs/my_tab.html.tmpl | 22 +++++-------------- .../en/default/admin/params/example.html.tmpl | 22 +++++-------------- .../hook/account/prefs/prefs-tabs.html.tmpl | 22 +++++-------------- .../params/editparams-current_panel.html.tmpl | 22 +++++-------------- .../admin/sanitycheck/messages-statuses.html.tmpl | 23 +++++--------------- .../hook/global/setting-descs-settings.none.tmpl | 10 ++++++++- .../hook/global/user-error-errors.html.tmpl | 11 +++++----- .../template/en/default/pages/example.html.tmpl | 23 +++++--------------- .../template/en/default/setup/strings.txt.pl | 22 +++++-------------- 16 files changed, 84 insertions(+), 258 deletions(-) (limited to 'extensions/Example') diff --git a/extensions/Example/Config.pm b/extensions/Example/Config.pm index 378db359d..b40ed9906 100644 --- a/extensions/Example/Config.pm +++ b/extensions/Example/Config.pm @@ -1,23 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by the Initial Developers are Copyright (C) 2009 the -# Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example; use strict; diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm index 4498d2b22..4c2d51336 100644 --- a/extensions/Example/Extension.pm +++ b/extensions/Example/Extension.pm @@ -1,24 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by the Initial Developers are Copyright (C) 2009 the -# Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Max Kanat-Alexander -# Frédéric Buclin +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example; use strict; diff --git a/extensions/Example/lib/Auth/Login.pm b/extensions/Example/lib/Auth/Login.pm index 9f4f37dc3..f87831157 100644 --- a/extensions/Example/lib/Auth/Login.pm +++ b/extensions/Example/lib/Auth/Login.pm @@ -1,22 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical are Copyright (C) 2008 Canonical Ltd. -# All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example::Auth::Login; use strict; diff --git a/extensions/Example/lib/Auth/Verify.pm b/extensions/Example/lib/Auth/Verify.pm index 0141a0d6a..0d068b2e1 100644 --- a/extensions/Example/lib/Auth/Verify.pm +++ b/extensions/Example/lib/Auth/Verify.pm @@ -1,22 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical are Copyright (C) 2008 Canonical Ltd. -# All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example::Auth::Verify; use strict; diff --git a/extensions/Example/lib/Config.pm b/extensions/Example/lib/Config.pm index 75db22957..b0497a783 100644 --- a/extensions/Example/lib/Config.pm +++ b/extensions/Example/lib/Config.pm @@ -1,23 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander -# Bradley Baetz +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example::Config; use strict; diff --git a/extensions/Example/lib/Util.pm b/extensions/Example/lib/Util.pm index 596f048e9..b4ed3e0a4 100644 --- a/extensions/Example/lib/Util.pm +++ b/extensions/Example/lib/Util.pm @@ -1,22 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by Everything Solved, Inc. are Copyright (C) 2009 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example::Util; use strict; diff --git a/extensions/Example/lib/WebService.pm b/extensions/Example/lib/WebService.pm index 8563ec7f0..659189d2f 100644 --- a/extensions/Example/lib/WebService.pm +++ b/extensions/Example/lib/WebService.pm @@ -1,22 +1,9 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +# 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/. # -# 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 Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by Everything Solved, Inc. are Copyright (C) 2007 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. package Bugzilla::Extension::Example::WebService; use strict; diff --git a/extensions/Example/template/en/default/account/prefs/my_tab.html.tmpl b/extensions/Example/template/en/default/account/prefs/my_tab.html.tmpl index ca7a3bd13..d2f1dcd1e 100644 --- a/extensions/Example/template/en/default/account/prefs/my_tab.html.tmpl +++ b/extensions/Example/template/en/default/account/prefs/my_tab.html.tmpl @@ -1,21 +1,9 @@ -[%# - # 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/ +[%# 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/. # - # 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 Bugzilla Example Plugin. - # - # The Initial Developer of the Original Code is Frédéric Buclin. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): Frédéric Buclin + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%]

diff --git a/extensions/Example/template/en/default/admin/params/example.html.tmpl b/extensions/Example/template/en/default/admin/params/example.html.tmpl index e2bb5f35c..48143945c 100644 --- a/extensions/Example/template/en/default/admin/params/example.html.tmpl +++ b/extensions/Example/template/en/default/admin/params/example.html.tmpl @@ -1,21 +1,9 @@ -[%# - # 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/ +[%# 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/. # - # 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 Bugzilla Example Plugin. - # - # The Initial Developer of the Original Code is Canonical Ltd. - # Portions created by Canonical Ltd. are Copyright (C) 2008 - # Canonical Ltd. All Rights Reserved. - # - # Contributor(s): Bradley Baetz + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% title = "Example Extension" diff --git a/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl b/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl index 83801540a..202dd1e1a 100644 --- a/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl +++ b/extensions/Example/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl @@ -1,21 +1,9 @@ -[%# - # 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/ +[%# 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/. # - # 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 Bugzilla Example Plugin. - # - # The Initial Developer of the Original Code is Frédéric Buclin. - # Portions created by the Initial Developer are Copyright (C) 2010 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): Frédéric Buclin + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% tabs = tabs.import([{ name => "my_tab", label => "Example Custom Preferences", diff --git a/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl b/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl index a12848087..42826e914 100644 --- a/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl +++ b/extensions/Example/template/en/default/hook/admin/params/editparams-current_panel.html.tmpl @@ -1,21 +1,9 @@ -[%# 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/ +[%# 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/. # - # 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 Example Bugzilla Extension. - # - # The Initial Developer of the Original Code is Ali Ustek - # Portions created by the Initial Developer are Copyright (C) 2011 the - # Initial Developer. All Rights Reserved. - # - # Contributor(s): - # Ali Ustek + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF panel.name == "auth" %] diff --git a/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl b/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl index 639752ed5..9cc455185 100644 --- a/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl +++ b/extensions/Example/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl @@ -1,22 +1,9 @@ -[%# -*- Mode: perl; indent-tabs-mode: nil -*- +[%# 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/. # - # 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 Bugzilla Example Plugin. - # - # The Initial Developer of the Original Code is ITA Software - # Portions created by the Initial Developer are Copyright (C) 2009 - # the Initial Developer. All Rights Reserved. - # - # Contributor(s): Bradley Baetz + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF san_tag == "example_check_au_user" %] diff --git a/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl b/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl index 9dc5fc767..7077f2690 100644 --- a/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl +++ b/extensions/Example/template/en/default/hook/global/setting-descs-settings.none.tmpl @@ -1,6 +1,14 @@ +[%# 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/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + [% setting_descs.product_chooser = "Product chooser to use when entering $terms.bugs", setting_descs.pretty = "Pretty chooser with common products and icons", setting_descs.full = "Full chooser with all products", setting_descs.small = "Product chooser for mobile devices", -%] \ No newline at end of file +%] diff --git a/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl index 50d20a9f2..33c77e44d 100644 --- a/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/Example/template/en/default/hook/global/user-error-errors.html.tmpl @@ -1,10 +1,9 @@ -[%# Note that error messages should generally be indented four spaces, like - # below, because when Bugzilla translates an error message into plain - # text, it takes four spaces off the beginning of the lines. +[%# 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/. # - # Note also that I prefixed my error name with "example", the name of my - # extension, so that I wouldn't conflict with other error names in - # Bugzilla or other extensions. + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% IF error == "example_my_error" %] [% title = "Example Error Title" %] diff --git a/extensions/Example/template/en/default/pages/example.html.tmpl b/extensions/Example/template/en/default/pages/example.html.tmpl index 919fa15b4..fda74bf35 100644 --- a/extensions/Example/template/en/default/pages/example.html.tmpl +++ b/extensions/Example/template/en/default/pages/example.html.tmpl @@ -1,22 +1,9 @@ -[%# - # 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/ +[%# 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/. # - # 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 Bugzilla Example Plugin. - # - # The Initial Developer of the Original Code is Canonical Ltd. - # Portions created by Canonical Ltd. are Copyright (C) 2009 - # Canonical Ltd. All Rights Reserved. - # - # Contributor(s): - # Max Kanat-Alexander + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% PROCESS global/header.html.tmpl diff --git a/extensions/Example/template/en/default/setup/strings.txt.pl b/extensions/Example/template/en/default/setup/strings.txt.pl index 8da19c0aa..98550547e 100644 --- a/extensions/Example/template/en/default/setup/strings.txt.pl +++ b/extensions/Example/template/en/default/setup/strings.txt.pl @@ -1,21 +1,9 @@ -# 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/ +# 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/. # -# 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 Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by the Initial Developer are Copyright (C) 2009 the -# Initial Developer. All Rights Reserved. -# -# The Original Code is the Bugzilla Bug Tracking System. -# -# Contributor(s): -# Max Kanat-Alexander +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. %strings = ( feature_example_acme => 'Example Extension: Acme Feature', -- cgit v1.2.3-24-g4f1b