Fix license headers and the generated license.html file
authorFlorian Quèze <florian@instantbird.org>
Thu, 24 Jul 2008 21:59:44 +0200
changeset 17431 3a320867c55388c9c725e6b6a63d6775431f3004
parent 17430 49d02418f3e5ba620cdbfb538afd81e4addbd5da
child 17432 932fcb10703b4c82ec24c34030806a3abf0f2032
push idunknown
push userunknown
push dateunknown
Fix license headers and the generated license.html file
im/Makefile.in
im/app/Makefile.in
im/app/app-license.html
im/app/application.ini
im/base/Makefile.in
im/build.mk
im/confvars.sh
im/locales/Makefile.in
im/themes/Makefile.in
im/themes/winstripe/Makefile.in
im/themes/winstripe/instantbird/Makefile.in
--- a/im/Makefile.in
+++ b/im/Makefile.in
@@ -15,16 +15,17 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 1998
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#   Florian QUEZE <florian@instantbird.org>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
 # of those above. If you wish to allow use of your version of this file only
 # under the terms of either the GPL or the LGPL, and not to allow others to
 # use your version of this file under the terms of the MPL, indicate your
@@ -38,17 +39,16 @@
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 DIRS		= base locales themes app
-# components extensions
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER
 DIRS += installer/windows
 
 # For Windows build the uninstaller during the application build since the
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -372,17 +372,18 @@ libs:: $(PROGRAM)
 	find $(DIST)/$(APP_NAME).app -type d -name ".svn" -prune -exec rm -rf {} \;
 
 clean clobber::
 	rm -rf $(DIST)/$(APP_NAME).app
 endif
 
 $(MAIL_LICENSE_HTML_FILE): $(PLATFORM_LICENSE_FILE) $(MAIL_APP_LICENSE_FILE)
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $< | \
-	sed -e "s/about:license\#/\#/" > $@
+	sed -e "s/about:license\#/\#/" | \
+	sed -e "s/available under one/available under a subset of it or one/" > $@
 
 libs:: $(MAIL_LICENSE_TXT_FILE) $(MAIL_LICENSE_HTML_FILE)
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
 	for file in $^; do \
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $$file > $(FINAL_TARGET)/`basename $$file`; \
 	done
 else
--- a/im/app/app-license.html
+++ b/im/app/app-license.html
@@ -1,5 +1,4 @@
     <p>Official <b>binaries</b> of this product released by 
-    <a href="http://www.mozillamessaging.com/">Mozilla Messaging, Inc.</a> 
-    are made available under 
-    <a href="http://www.mozilla.org/foundation/EULA/">the corresponding 
-    EULA</a>.
+    the <a href="http://www.instantbird.com/">Instantbird</a> team 
+    are made available under the GNU General Public License
+    (<a href="#gpl">GPL</a>) version 2.0 or later.
--- a/im/app/application.ini
+++ b/im/app/application.ini
@@ -15,16 +15,17 @@
 ;
 ; The Initial Developer of the Original Code is
 ; Benjamin Smedberg <benjamin@smedbergs.us>.
 ;
 ; Portions created by the Initial Developer are Copyright (C) 2006
 ; the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
 ;
 ; Contributor(s):
+;   Florian QUEZE <florian@instantbird.org>
 ;
 ; Alternatively, the contents of this file may be used under the terms of
 ; either the GNU General Public License Version 2 or later (the "GPL"), or
 ; the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 ; in which case the provisions of the GPL or the LGPL are applicable instead
 ; of those above. If you wish to allow use of your version of this file only
 ; under the terms of either the GPL or the LGPL, and not to allow others to
 ; use your version of this file under the terms of the MPL, indicate your
--- a/im/base/Makefile.in
+++ b/im/base/Makefile.in
@@ -9,18 +9,18 @@
 # 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 Mozilla Browser code.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
+#   Florian QUEZE <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
--- a/im/build.mk
+++ b/im/build.mk
@@ -1,8 +1,46 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# 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 Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org/>.
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Benjamin Smedberg <benjamin@smedbergs.us> (Initial Code)
+#   Florian QUEZE <florian@instantbird.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
 ifndef LIBXUL_SDK
 include $(topsrcdir)/toolkit/toolkit-tiers.mk
 endif
 
 TIERS += app
 
 tier_app_dirs += \
   purple \
--- a/im/confvars.sh
+++ b/im/confvars.sh
@@ -1,8 +1,47 @@
+#! /bin/sh
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# 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 Mozilla Build System
+#
+# The Initial Developer of the Original Code is
+# Ben Turner <mozilla@songbirdnest.com>
+#
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Florian QUEZE <florian@instantbird.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
 MOZ_APP_NAME=instantbird
 MOZ_APP_DISPLAYNAME=Instantbird
 MOZ_APP_VERSION=0.1.2pre
 MOZ_XUL_APP=1
 MOZ_ENABLE_LIBXUL=1
 MOZ_XULRUNNER=1
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_UPDATER=1
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -40,13 +40,12 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = instantbird/locales
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_VERSION=$(APP_VERSION) \
-	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR)toto \
+	-DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
--- a/im/themes/Makefile.in
+++ b/im/themes/Makefile.in
@@ -9,18 +9,18 @@
 # 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 Mozilla Browser code.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
+#   Florian QUEZE <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
--- a/im/themes/winstripe/Makefile.in
+++ b/im/themes/winstripe/Makefile.in
@@ -9,18 +9,18 @@
 # 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 Mozilla Browser code.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
+#   Florian QUEZE <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead
--- a/im/themes/winstripe/instantbird/Makefile.in
+++ b/im/themes/winstripe/instantbird/Makefile.in
@@ -9,18 +9,18 @@
 # 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 Mozilla Browser code.
 #
 # The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
+#   Florian QUEZE <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
 # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 # in which case the provisions of the GPL or the LGPL are applicable instead