*** empty log message ***

[lilypond.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 743e63c34dda40f4eefeba917354ebaadfcbbb2e..5ce05852a309334b97385da995f542e82aa703e1 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,16 @@
 This package was Debianized by Anthony Fok <foka@debian.org> on
 Wed,  6 Aug 1997 04:30:28 -0600
 
-The development branch, lilypond1.3, is packaged separately
+The development branch, lilypond1.3, was packaged separately
 on Tue,  9 Nov 1999 22:30:32 -0700
+but was merged back into the lilypond package
+as of Mon, 16 Apr 2001 21:58:42 -0600
 
 It was downloaded from
-      ftp://ftp.lilypond.org/pub/LilyPond/v1.3/lilypond-1.3.24.tar.gz
-
-It is also available at: 
-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/lilypond-1.3.24.tar.gz
+    ftp://ftp.lilypond.org/pub/LilyPond/
 
 For more information about GNU LilyPond, please visit:
-      http://www.cs.uu.nl/~hanwen/lilypond/
-  or  http://www.xs4all.nl/~jantien/
-  or  http://www.lilypond.org/
-  or  http://sca.uwaterloo.ca/lilypond/
+    http://www.lilypond.org/
 
 Authors:
       Han-Wen Nienhuys <hanwen@cs.uu.nl>
@@ -22,7 +18,7 @@ Authors:
  
 Copyright:
 
-  GNU LilyPond is Copyright (C) 1996-2000
+  GNU LilyPond is Copyright (C) 1996--2004
   Jan Nieuwenhuizen & Han-Wen Nienhuys
 
     This program is free software; you can redistribute it and/or modify
@@ -42,7 +38,7 @@ Copyright:
     *** NOTE
 
             This license applies to all files except the included example
-    input files (which are in the subdirectory input/ and mutopia/ )
+    input files (which are in the subdirectory input/ )
 
     *** END NOTE