[Libreoffice-commits] .: TEMPLATE.SOURCECODE.HEADER

[Michael Meeks]

 TEMPLATE.SOURCECODE.HEADER |   31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

New commits:
commit 68bcd5a3e8b6a18c239b1b55e97ddd359141c58e
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Aug 8 14:12:19 2012 +0100

    Add extra clarity as to which version to choose
    
    Change-Id: I5528329b1d62074fb48f0a98419da66303584261

diff --git a/TEMPLATE.SOURCECODE.HEADER b/TEMPLATE.SOURCECODE.HEADER
index bae1397..eabd9aa 100644
--- a/TEMPLATE.SOURCECODE.HEADER
+++ b/TEMPLATE.SOURCECODE.HEADER
@@ -1,6 +1,31 @@
 ------------------------------------------------------------------------
 
-             For all new, original source files created by
+                          * Stop / Think *
+
+	You need to choose either a pure MPLv2 header (from the top),
+or an MPLv2 on ALv2 header (from the bottom).
+
+	If the new module you created is based in any way on an
+existing module, then:
+
+	a) if that module has an LGPLv3+ header - please retain that
+	   in the new code, it will get updated when that module is
+	   re-based.
+
+	b) if that module has an MPLv2 on ALv2 header - please use
+	   this option or
+
+	c) if the module is entirely your own work, and/or based on an
+	   existing MPLv2 header - please use that header.
+
+	For any questions please contact me directly:
+			    michael.meeks at suse.com.
+
+	Thanks !
+
+------------------------------------------------------------------------
+
+             For all entirely new, original source files created by
                         LibreOffice hackers:
 
 ------------------------------------------------------------------------
@@ -46,8 +71,8 @@ For XML / .component:
 
 ------------------------------------------------------------------------
 
-             Only for source files which may contain code
-                 from the Apache Software Foundation:
+             For source files which may contain code
+               from the Apache Software Foundation:
 
 ------------------------------------------------------------------------