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

2 files changed, 15 insertions, 3 deletions

diff --git a/contrib/bugzilla-submit/bugzilla-submit b/contrib/bugzilla-submit/bugzilla-submit
index d98e7de8d..9cd334944 100755
--- a/contrib/bugzilla-submit/bugzilla-submit
+++ b/contrib/bugzilla-submit/bugzilla-submit
@@ -1,5 +1,12 @@
-#!/usr/bin/env python 
+#!/usr/bin/env python
+# 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.
+
+
 # bugzilla-submit: a command-line script to post bugs to a Bugzilla instance
 #
 # Authors: Christian Reis <kiko@async.com.br>
@@ -298,4 +305,3 @@ if __name__ == "__main__":
                  'form_name'         : 'enter_bug'})
 
     submit_bug_POST(bugzilla, data)
-
diff --git a/contrib/bugzilla-submit/bugzilla-submit.xml b/contrib/bugzilla-submit/bugzilla-submit.xml
index 5c818e268..2cfdc9209 100755
--- a/contrib/bugzilla-submit/bugzilla-submit.xml
+++ b/contrib/bugzilla-submit/bugzilla-submit.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- 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.
+-->
 <!DOCTYPE refentry PUBLIC 
    "-//OASIS//DTD DocBook XML V4.1.2//EN"
    "docbook/docbookx.dtd">
@@ -218,4 +225,3 @@ specified to <application>bugzilla-submit</application>.</para>
 &lt;esr@thyrsus.com&gt;.</para> 
 </refsect1> 
 </refentry>
-