[etoys-dev] [SVN][1462] Update copyright NOTICE

[commits at etoys.squeak.org]

Repository: http://etoys.squeak.org/svn

Revision: 1462
Author:   bf
Date:     2012-03-26 13:47:12 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Update copyright NOTICE

Modified Paths:
--------------
    trunk/Documentation/Release-HowTo.txt
    trunk/Etoys/NOTICE

-------------- next part --------------
Modified: trunk/Documentation/Release-HowTo.txt
===================================================================
--- trunk/Documentation/Release-HowTo.txt	2012-03-25 05:58:12 UTC (rev 1461)
+++ trunk/Documentation/Release-HowTo.txt	2012-03-26 13:47:12 UTC (rev 1462)
@@ -235,6 +235,15 @@
     About to delete: fa en_GB fil pl th pap zh_TW am gl mk km is gu
     Press ^C to abort, Return to continue ...
 
+### LICENSE NOTICE ###
+
+The NOTICE file is an extension of the Apache 2.0 LICENSE file. It
+contains the copyright line. This needs to be updated every year. Also,
+the image contains a copy of that notice. The release builder checks
+that the two match. If it fails, you need to update the "copyright" and
+"copyrightNotice" methods (and possibly the ReleaseBuilder's
+"checkCopyright" method, if the format changed).
+
 ### NEWS ###
 
 To keep track of what changed, updating the Etoys/NEWS file is
@@ -254,7 +263,7 @@
 5. Build installers
 -------------------
 
-### Etoys-To-Go
+### Etoys-To-Go ###
 
 You need to edit the version numbers in 
 
@@ -306,11 +315,11 @@
     
     host:to-go user$ scp Etoys-To-Go-4.1.2.zip squeakland at squeakland.org:installers/
 
-### Windows
+### Windows ###
 
 Korakurider has been building Win installers. Maybe he can tell us how?
 
-### Mac
+### Mac ###
 
 Bert has been building Mac installers. Maybe he can tell us how?
 
@@ -318,14 +327,14 @@
     installers/os-x/assets/scripts/postflight 
   (should be checked automatically in build script)
 
-### Linux
+### Linux ###
 
 Linux installers (rpm, deb, etc.) are built by many people, the
 "packagers" of the various Linux distributions. They need a "source"
 tar ball from us. It needs to be uploaded to sugarlabs and then be 
 announced (e.g. on the Sugar-devel list and the debian squeak list).
 
-http://download.sugarlabs.org/sources/sucrose/glucose/etoys/
+    http://download.sugarlabs.org/sources/sucrose/glucose/etoys/
 
 The Makefile etc. lives in the repository at
 
@@ -334,7 +343,7 @@
 The Etoys package depends on the distro's own Squeak VM package, it
 does not contain architecture-dependent code (only a shell script).
 
-### Sugar
+### Sugar ###
 
 The Etoys Sugar activity has its own git repository at
 
@@ -356,12 +365,14 @@
 they need to be converted to .sexp.gz files.
 
 1. Execute this
+    `
     | inDir outDir |
     inDir := FileDirectory default directoryNamed: 'quick-in'.
     outDir := FileDirectory default directoryNamed: 'quick-out'.
     inDir assureExistence.
     outDir assureExistence.
     QuickGuideMorph convertProjectsWithBooksToSISSIn: inDir to: outDir.
+    `
 2. On first run this will create the "quick-in" and "quick-out"
    folders. Put the .pr files to be converted into "quick-in".
 3. Execute the above again. This will put the converted QuickGuides
@@ -393,12 +404,14 @@
 2. Arrange the thumbnails to your liking.
 3. Before saving the Gallery project, fix up the ProjectViewMorphs by
    executing this:
+   `
     World allMorphsDo: [:m |
     	((m isKindOf: ProjectViewMorph)
     	    and: [m isTheRealProjectPresent]) ifTrue: [
     		    m project: (DiskProxy global: #Project
         			selector: #namedExample:
         			args: {project name, '.pr'})]].
+    `
    This is needed so the project will be found in the ExampleEtoys
    folder.
 4. Move the new Gallery project file to the Etoys folder, and the

Modified: trunk/Etoys/NOTICE
===================================================================
--- trunk/Etoys/NOTICE	2012-03-25 05:58:12 UTC (rev 1461)
+++ trunk/Etoys/NOTICE	2012-03-26 13:47:12 UTC (rev 1462)
@@ -1,4 +1,4 @@
-The files "etoys.image" and "EtoysV4.sources" contain portions of the
+The files "etoys.image" and "EtoysV5.stc" contain portions of the
 original Squeak 1.1 release, which was relicensed by Apple in 2007 to the
 Apache 2.0 license:
 
@@ -28,7 +28,8 @@
 
 Everything else is
 
-   Copyright (c) 1996-2011 Viewpoints Research Institute, and Contributors
+   Copyright (c) 1996-2009 Viewpoints Research Institute, and Contributors;
+   Copyright (c) 2010-2012 Squeak Community Contributors
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal