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

[lilypond.git] / COPYING

diff --git a/COPYING b/COPYING
index 545b9dced72f47ccdedd47afe948ec9425cb012a..32f7714f7995e0f7af797af93b4d6cb5d502a96e 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,31 +1,22 @@
+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.
 
-*** NOTE
+- 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.
 
-1. This license applies to all files that do not explicitly specify
-another license.
 
 
-2. This license does not apply to the included example input files
-(which are in the subdirectory input/).
-
-3. The following addition applies to the fonts included in this
-package. 
-
-       As a special exception, if you create a document which uses
-       this font, and embed this font or unaltered portions of this
-       font into the document, 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.
-
-Sources of the included fonts are in the subdirectory mf/
-
-*** END NOTE
 
                    GNU GENERAL PUBLIC LICENSE
                       Version 2, June 1991