X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fcopyright;h=1d9be19f7832ff2e6b66240f26d6f202fc9e4216;hb=570b036c77a7143584d08eb81390d78702886b8e;hp=7f4801cbe47ed474aef8f5d6829dd46bcf072f82;hpb=127a1c165d3c16f971413ba36de9bb65cf3d8aa4;p=lilypond.git

diff --git a/debian/copyright b/debian/copyright
index 7f4801cbe4..1d9be19f78 100644
--- 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.74.tar.gz
-
-It is also available at: 
-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/v1.3/lilypond-1.3.74.tar.gz
+    http://lilypond.org/download/v2.2/lilypond-2.2.2.tar.gz
 
 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://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