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

17 files changed, 121 insertions, 259 deletions

diff --git a/skins/standard/IE-fixes.css b/skins/standard/IE-fixes.css
index 7ef30e501..727667f73 100644
--- a/skins/standard/IE-fixes.css
+++ b/skins/standard/IE-fixes.css
@@ -1,17 +1,10 @@
-/* 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.
-  *
-  * Contributor(s): Marc Schumann <wurblzap@gmail.com>
-  */
+/* 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.
+ */
 
 .bz_comment_text, .uneditable_textarea, tbody.file pre {
      white-space: pre;
@@ -59,5 +52,3 @@ form#Create #comp_desc {
     /* color:inherit */
     color: expression(this.parentNode.currentStyle['color']);
 }
-
-
diff --git a/skins/standard/admin.css b/skins/standard/admin.css
index 6b330ef6d..0b138642c 100644
--- a/skins/standard/admin.css
+++ b/skins/standard/admin.css
@@ -1,17 +1,10 @@
-/* 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.
-  *
-  * Contributor(s): Marc Schumann <wurblzap@gmail.com>
-  */
+/* 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.
+ */
 
 .warningmessages, .criticalmessages {
     background-color: white;
diff --git a/skins/standard/attachment.css b/skins/standard/attachment.css
index 287160331..b3c21bccf 100644
--- a/skins/standard/attachment.css
+++ b/skins/standard/attachment.css
@@ -1,21 +1,10 @@
- /* 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.
-  *
-  * Contributor(s): Myk Melez <myk@mozilla.org>
-  *                 Joel Peshkin <bugreport@peshkin.net>
-  *                 Erik Stambaugh <erik@dasbistro.com>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Guy Pyrzak <guy.pyrzak@gmail.com>
-  */
+/* 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.
+ */
 
 table.attachment_entry th {
     text-align: right;
diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css
index ebebfb3ef..010cd11e8 100644
--- a/skins/standard/buglist.css
+++ b/skins/standard/buglist.css
@@ -1,22 +1,10 @@
-/* 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 Netscape Communications
-  * Corporation. Portions created by Netscape are
-  * Copyright (C) 1998 Netscape Communications Corporation. All
-  * Rights Reserved.
-  *
-  * Contributor(s): Myk Melez <myk@mozilla.org>
-  */
+/* 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.
+ */
 .bz_query_head {
   text-align: center;
 }
@@ -126,4 +114,3 @@ td.bz_total {
 .bz_short_desc_column a, .bz_short_short_desc_column a {
     color: inherit;
 }
-
diff --git a/skins/standard/dependency-tree.css b/skins/standard/dependency-tree.css
index cab167171..0051fca36 100644
--- a/skins/standard/dependency-tree.css
+++ b/skins/standard/dependency-tree.css
@@ -1,24 +1,10 @@
-/* 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 Netscape
-  * Communications
-  * Corporation. Portions created by Netscape are
-  * Copyright (C) 1998 Netscape Communications Corporation. All
-  * Rights Reserved.
-  *
-  * Contributor(s): Christian Reis <kiko@async.com.br>
-  *                 André Batosti <batosti@async.com.br>
-  */
+/* 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.
+ */
 
 ul.tree {
     padding-left: 0em;
diff --git a/skins/standard/duplicates.css b/skins/standard/duplicates.css
index e89b72c59..b531597a4 100644
--- a/skins/standard/duplicates.css
+++ b/skins/standard/duplicates.css
@@ -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/
- * 
- * 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 Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- * 
- * Contributor(s):
- *   Max Kanat-Alexander <mkanat@bugzilla.org>
+/* 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.
  */
 
 #duplicates_table {
diff --git a/skins/standard/editusers.css b/skins/standard/editusers.css
index 770d602c8..fb38af67d 100644
--- a/skins/standard/editusers.css
+++ b/skins/standard/editusers.css
@@ -1,17 +1,10 @@
-/* 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.
-  *
-  * Contributor(s): Marc Schumann <wurblzap@gmail.com>
-  */
+/* 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.
+ */
 
 table.main {
     border-spacing: 1em;
diff --git a/skins/standard/enter_bug.css b/skins/standard/enter_bug.css
index 88d9e9e85..e0f1ab656 100644
--- a/skins/standard/enter_bug.css
+++ b/skins/standard/enter_bug.css
@@ -1,27 +1,10 @@
-/* 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 Netscape Communications
-  * Corporation. Portions created by Netscape are Copyright (C) 1998
-  * Netscape Communications Corporation. All Rights Reserved.
-  *
-  * Contributor(s): Byron Jones <bugzilla@glob.com.au>
-  *                 Christian Reis <kiko@async.com.br>
-  *                 Vitaly Harisov <vitaly@rathedg.com>
-  *                 Svetlana Harisova <light@rathedg.com>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Pascal Held <paheld@gmail.com>
-  *                 Max Kanat-Alexander <mkanat@bugzilla.org>
-  */
+/* 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.
+ */
 
 /* These are specified using the class instead of the id so that they
    don't override the YUI CSS. */
@@ -69,4 +52,4 @@
 /* Make the Add Me to CC button never wrap. */
 #possible_duplicates .yui-dt-col-update_token { white-space: nowrap; }
 
-form#Create #possible_duplicates td { vertical-align: middle; }
\ No newline at end of file
+form#Create #possible_duplicates td { vertical-align: middle; }
diff --git a/skins/standard/global.css b/skins/standard/global.css
index e8336d5c1..0d137c18e 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -1,27 +1,10 @@
-/* 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 Netscape Communications
-  * Corporation. Portions created by Netscape are
-  * Copyright (C) 1998 Netscape Communications Corporation. All
-  * Rights Reserved.
-  *
-  * Contributor(s): Byron Jones <bugzilla@glob.com.au>
-  *                 Christian Reis <kiko@async.com.br>
-  *                 Vitaly Harisov <vitaly@rathedg.com>
-  *                 Svetlana Harisova <light@rathedg.com>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Pascal Held <paheld@gmail.com>
-  */
+/* 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.
+ */
 
 /* global (begin) */
     body {
diff --git a/skins/standard/index.css b/skins/standard/index.css
index 1e440cb99..595692025 100644
--- a/skins/standard/index.css
+++ b/skins/standard/index.css
@@ -1,18 +1,10 @@
- /* 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.
-  *
-  * Contributor(s): Vitaly Harisov <vitaly@rathedg.com>
-  *                 Guy Pyrzak <guy.pyrzak@gmail.com> 
-  */
+/* 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.
+ */
 
 /* index page (begin) */
 
diff --git a/skins/standard/page.css b/skins/standard/page.css
index da0c3be8d..f4037f3de 100644
--- a/skins/standard/page.css
+++ b/skins/standard/page.css
@@ -1,21 +1,10 @@
-/* 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 Initial Developer of the Original Code is Everything Solved.
-  * Portions created by Everything Solved are Copyright (C) 2006
-  * Everything Solved. All Rights Reserved.
-  *
-  * The Original Code is the Bugzilla Bug Tracking System.
-  *
-  * Contributor(s): Max Kanat-Alexander <mkanat@bugzilla.org>
-  */
+/* 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.
+ */
 
 /* This CSS is used by various informational pages in the
    template/en/default/pages/ directory. */
diff --git a/skins/standard/params.css b/skins/standard/params.css
index 4eec75261..9f2bf0d95 100644
--- a/skins/standard/params.css
+++ b/skins/standard/params.css
@@ -1,4 +1,10 @@
-#menu {
+/* 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.
+ */
   width: 10em;
   margin-top: 1em;
   margin-right: 0.5em;
diff --git a/skins/standard/reports.css b/skins/standard/reports.css
index 00272fdba..065fe72bb 100644
--- a/skins/standard/reports.css
+++ b/skins/standard/reports.css
@@ -1,22 +1,10 @@
-/* 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 Developer are Copyright (C)
-  * 2009 the Initial Developer. All Rights Reserved.
-  *
-  * Contributor(s): 
-  *   Max Kanat-Alexander <mkanat@bugzilla.org>
-  */
+/* 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.
+ */
 
 /* describecomponents.cgi */
 
@@ -89,4 +77,3 @@
   padding-bottom: .5em;
   color: #333;
 }
-
diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css
index 509d87f66..aa04b6ffe 100644
--- a/skins/standard/search_form.css
+++ b/skins/standard/search_form.css
@@ -1,22 +1,10 @@
-/* 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 Guy Pyrzak
-  * Portions created by the Initial Developer are Copyright (C) 2010 the
-  * Initial Developer. All Rights Reserved.
-  *
-  * Contributor(s): 
-  *           Guy Pyrzak <guy.pyrzak@gmail.com>
-  */
+/* 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.
+ */
 
 #summary_field {
   padding: 1em;
diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index 99c0b405e..9c15599ee 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -1,3 +1,11 @@
+/* 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.
+ */
+
 .bz_alias_short_desc_container {
     margin: 8px 0; 
     padding: 0.3em; 
diff --git a/skins/standard/show_multiple.css b/skins/standard/show_multiple.css
index 50875382d..dbfa6eb19 100644
--- a/skins/standard/show_multiple.css
+++ b/skins/standard/show_multiple.css
@@ -1,3 +1,11 @@
+/* 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.
+ */
+
 hr {margin: 20px auto 40px}
 
 .bz_private { color:darkred }
diff --git a/skins/standard/summarize-time.css b/skins/standard/summarize-time.css
index d3f121290..bb42da6fe 100644
--- a/skins/standard/summarize-time.css
+++ b/skins/standard/summarize-time.css
@@ -1,17 +1,10 @@
-/* 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.
-  *
-  * Contributor(s): Christian Reis <kiko@async.com.br>
-  */
+/* 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.
+ */
 
 td { vertical-align: top }
 
@@ -42,5 +35,3 @@ td.subtotal {
 /* the details headers */
 .number .owner_header, .owner .bug_header { background: #ffffff }
 .number .owner_header2, .owner .bug_header2 { background: #EFEFEF }
-
-