* Ignore test failures on non-i386/amd64 architectures (Closes:

[lilypond.git] / COPYING

diff --git a/COPYING b/COPYING
index 54b93e6973e7ff749dbf4e46a5d115e9eba90009..32f7714f7995e0f7af797af93b4d6cb5d502a96e 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,17 +1,28 @@
-This license applies to all files except:
+If you want to redistribute LilyPond, you must comply with the GNU
+General Public License (reproduced below). This license applies to
+LilyPond with the following exceptions:
+
+- It does not apply to example input files (which are in
+the subdirectory input/) that explicitly specify another license.
+
+- If you create a document which uses fonts included in LilyPond, and
+embed this font or unaltered portions of this font into the document,
+then this font does not by itself cause the resulting document to be
+covered by the GNU General Public License. This exception does not
+however invalidate any other reasons why the document might be covered
+by the GNU General Public License. If you modify this font, you may
+extend this exception to your version of the font, but you are not
+obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
 
-       - the included input files which explicitly state a different
-copyright
 
-       - the MetaFont sources, found in the subdirectory mf/. See
-mf/README.
 
 
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+     51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -313,8 +324,8 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
 
 Also add information on how to contact you by electronic and paper mail.