resolve merge

[lilypond.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 33836d1778d18f225e534d4aa1c5dcdffecf95d8..0983b05e3c746ab18627a91e2ba78e4b943166e7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,10 +7,10 @@ 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/
+    http://lilypond.org/download/v2.2/lilypond-2.2.2.tar.gz
 
 For more information about GNU LilyPond, please visit:
-    http://www.lilypond.org/
+    http://lilypond.org/
 
 Authors:
       Han-Wen Nienhuys <hanwen@cs.uu.nl>
@@ -18,7 +18,7 @@ Authors:
  
 Copyright:
 
-  GNU LilyPond is Copyright (C) 1996-2003
+  GNU LilyPond is Copyright (C) 1996--2004
   Jan Nieuwenhuizen & Han-Wen Nienhuys
 
     This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@ Copyright:
 
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
     *** NOTE