[Pkg-mozext-commits] [adblock-plus] 190/464: Relicensed from MPL 1.1 to MPL 2.0

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit dde8b65ce2a4536569622492a5c2d68087a83fd2
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Jan 4 09:17:23 2012 +0100

    Relicensed from MPL 1.1 to MPL 2.0
---
 LocaleTester.pm             | 4 ++++
 build.py                    | 7 +++----
 install.rdf.tmpl            | 4 ++++
 localeTools.py              | 7 +++----
 packager.py                 | 7 +++----
 packagerKMeleon.py          | 7 +++----
 releaseAutomation.py        | 7 +++----
 releaseAutomationKMeleon.py | 7 +++----
 8 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/LocaleTester.pm b/LocaleTester.pm
index 062fee3..78d03c6 100644
--- a/LocaleTester.pm
+++ b/LocaleTester.pm
@@ -1,3 +1,7 @@
+# This Source Code is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
+
 package LocaleTester;
 
 use strict;
diff --git a/build.py b/build.py
index d54d4a6..8a26ff9 100644
--- a/build.py
+++ b/build.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
-# 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 is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
 
 import os, sys, re, subprocess, buildtools
 from getopt import getopt, GetoptError
diff --git a/install.rdf.tmpl b/install.rdf.tmpl
index 1e4db07..8d84100 100644
--- a/install.rdf.tmpl
+++ b/install.rdf.tmpl
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 
+<!-- This Source Code is subject to the terms of the Mozilla Public License
+   - version 2.0 (the "License"). You can obtain a copy of the License at
+   - http://mozilla.org/MPL/2.0/. -->
+
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
diff --git a/localeTools.py b/localeTools.py
index 46ad15d..289a031 100644
--- a/localeTools.py
+++ b/localeTools.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
-# 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 is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
 
 import re, sys, codecs, cgi
 from StringIO import StringIO
diff --git a/packager.py b/packager.py
index dc684c1..6de4c9d 100644
--- a/packager.py
+++ b/packager.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
-# 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 is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
 
 import os, sys, re, subprocess, jinja2, buildtools, codecs, hashlib, base64, shutil
 from ConfigParser import SafeConfigParser
diff --git a/packagerKMeleon.py b/packagerKMeleon.py
index 3d8bbc8..9f8bad9 100644
--- a/packagerKMeleon.py
+++ b/packagerKMeleon.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
-# 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 is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
 
 import os, subprocess, re, tempfile, shutil, json
 import buildtools.packager as packager
diff --git a/releaseAutomation.py b/releaseAutomation.py
index 2058638..380ef98 100644
--- a/releaseAutomation.py
+++ b/releaseAutomation.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
-# 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 is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
 
 import os, re, subprocess, tarfile
 from StringIO import StringIO
diff --git a/releaseAutomationKMeleon.py b/releaseAutomationKMeleon.py
index b1b0a65..1f12e0e 100644
--- a/releaseAutomationKMeleon.py
+++ b/releaseAutomationKMeleon.py
@@ -1,9 +1,8 @@
 # coding: utf-8
 
-# 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 is subject to the terms of the Mozilla Public License
+# version 2.0 (the "License"). You can obtain a copy of the License at
+# http://mozilla.org/MPL/2.0/.
 
 import os, re, subprocess, tarfile
 from StringIO import StringIO

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git