lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

[disorder] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 78f57333138e2cf2ac3fde5e77788944fe2a82d0..c38986f1307e58af346b2b9b255251fdd87f363c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,20 +3,23 @@ Package home page:
 
 Packaged by:
   Richard Kettlewell <rjk@greenend.org.uk>
 
 Packaged by:
   Richard Kettlewell <rjk@greenend.org.uk>

+  Mark Wooding <mdw@distorted.org.uk>

 
 DisOrder - select and play digital audio files
 
 DisOrder - select and play digital audio files

-Copyright (C) 2003-2008 Richard Kettlewell
+Copyright (C) 2003-2015 Richard Kettlewell
+Portions copyright (C) 2007, 2013, 2015-2018 Mark Wooding

 Portions copyright (C) 2007 Ross Younger
 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
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) (C) 2000-2001 Robert Leslie

+Portions Copyright (C) 1997-2006 Free Software Foundation, Inc.
+Portions Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>

 Binaries may derive extra copyright owners through linkage
 (binary distributors are expected to do their own legwork)
 
 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,


@@ -25,8 +28,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
+On Debian systems, look in /usr/share/common-licenses/GPL-3 for a copy

 of the GPL.
 of the GPL.