Merge configuration fixes

[disorder] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 3a4abe5da09be4d1f1e7dd53c1e4ddda688fbf34..47a18e50ddf75a6940d949b2b5297aa265a6d09c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,16 +5,18 @@ Packaged by:
   Richard Kettlewell <rjk@greenend.org.uk>
 
 DisOrder - select and play digital audio files
   Richard Kettlewell <rjk@greenend.org.uk>
 
 DisOrder - select and play digital audio files

-Copyright (C) 2003, 2004, 2005, 2006, 2007 Richard Kettlewell
+Copyright (C) 2003-2008 Richard Kettlewell
+Portions copyright (C) 2007 Ross Younger
+Portions copyright (C) 2007 Mark Wooding

 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) (C) 2000-2001 Robert Leslie
 Binaries may derive extra copyright owners through linkage
 (binary distributors are expected to do their own legwork)
 
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) (C) 2000-2001 Robert Leslie
 Binaries may derive extra copyright owners through linkage
 (binary distributors are expected to do their own legwork)
 

-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify

 it under the terms of the GNU General Public License as published by
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation, either version 3 of the License, or

 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,


@@ -23,8 +25,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 On Debian systems, look in /usr/share/common-licenses/GPL for a copy
 of the GPL.
 
 On Debian systems, look in /usr/share/common-licenses/GPL for a copy
 of the GPL.