From 7aed86c977c211424ea4c06c1145083ae0cfeb8b Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 20 Jan 2012 16:31:29 +0000
Subject: [PATCH] Bug 718397: New extensions should be created using the MPL
 2.0 license r/a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@263291 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev             |  2 +-
 .../webtools/bugzilla/extensions/create.pl    |  5 +---
 .../en/default/extensions/license.txt.tmpl    | 24 ++++---------------
 .../en/default/global/messages.html.tmpl      |  3 +--
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 19661d63d9b..dcac9883a84 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8081
\ No newline at end of file
+8082
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/extensions/create.pl b/mozilla/webtools/bugzilla/extensions/create.pl
index 8ff7a872c95..5f1b884d250 100644
--- a/mozilla/webtools/bugzilla/extensions/create.pl
+++ b/mozilla/webtools/bugzilla/extensions/create.pl
@@ -14,7 +14,6 @@ use Bugzilla::Error;
 use Bugzilla::Util qw(get_text);
 
 use File::Path qw(mkpath);
-use DateTime;
 
 my $base_dir = bz_locations()->{'extensionsdir'};
 
@@ -34,10 +33,8 @@ foreach my $path (qw(lib web template/en/default/hook),
     mkpath("$extension_dir/$path") || die "$extension_dir/$path: $!";
 }
 
-my $year = DateTime->now()->year;
-
 my $template = Bugzilla->template;
-my $vars = { year => $year, name => $name, path => $extension_dir };
+my $vars = { name => $name, path => $extension_dir };
 my %create_files = (
     'config.pm.tmpl'       => 'Config.pm',
     'extension.pm.tmpl'    => 'Extension.pm',
diff --git a/mozilla/webtools/bugzilla/template/en/default/extensions/license.txt.tmpl b/mozilla/webtools/bugzilla/template/en/default/extensions/license.txt.tmpl
index 85bf2b9b93e..6acde01e054 100644
--- a/mozilla/webtools/bugzilla/template/en/default/extensions/license.txt.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/extensions/license.txt.tmpl
@@ -10,23 +10,9 @@
   # name: string; The name of the extension.
   #%]
 
-# -*- 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 [% name %] [%+ terms.Bugzilla %] Extension.
-#
-# The Initial Developer of the Original Code is YOUR NAME
-# Portions created by the Initial Developer are Copyright (C) [% year %] the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   YOUR NAME <YOUR EMAIL ADDRESS>
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
index c984d9d5d93..3b2a1eb132a 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/messages.html.tmpl
@@ -274,8 +274,7 @@
 
   [% ELSIF message_tag == "extension_created" %]
     An extension named [% name FILTER html %] has been created
-    in [% path FILTER html %]. Make sure you change "YOUR NAME" and 
-    "YOUR EMAIL ADDRESS" in the code to your name and your email address.
+    in [% path FILTER html %].
 
   [% ELSIF message_tag == "field_value_created" %]
     [% title = "New Field Value Created" %]