Adapted copyright to my personal style.

diff --git a/debian/copyright b/debian/copyright
index 63f02c3afea4b1c1c4d9923fd789d22ab8db1fd3..0fd6ac05a994fe7415b799c6e27d4e8adce61d48 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,99 +1,81 @@
 This package was debianized by René van Bevern <rvb@progn.org> on
 Wed, 30 Mar 2005 18:35:27 +0200.
 
-It was downloaded from
-http://hem.bredband.net/kaw/ncmpc/files/
-
-The NCMPC package is subject to the following license terms and
-copyrights. For exceptions, see further below.
-
-   Copyright 2004-2006 Kalle Wallin <kaw@linux.se>
-             2006 Jonathan Fors <etnoy@broach.se>
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   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
-   along with this package; if not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-   debian/:
-       Copyright 2005,2006 René van Bevern <rvb@progn.org>
-
-       As the Debian package of ncmpc is a derivative work based on
-       ncmpc, terms and conditions of the GNU General Public License
-       (or at your opinion) any later version apply.
-
-   src/libmpdclient.c:
-       Copyright 2003-2004 Warren Dukes <shank@mercury.chem.pitt.edu>
-
-       provided under the BSD License v2. The full license text is to be
-        found in /usr/share/common-licenses/BSD
-
-   src/strfsong.c:
-       Copyright 2003-2004 Warren Dukes <shank@mercury.chem.pitt.edu>
-                            normalperson
-                            Daniel Brown <danb@cs.utexas.edu>
-                            Kalle Wallin <kaw@linux.de>
-
-        Provided under the terms of the GNU General Public License or
-        (at your opinion) any later version.
-
-   src/screen_clock.c:
-       based on test/gdc.c from the ncurses package, which is
-        distributed under a slightly modified version of the MIT
-        license:
-
-       Copyright (c) 1998 Free Software Foundation, Inc.                      
-
-       Permission is hereby granted, free of charge, to any person
-       obtaining a copy of this software and associated documentation
-       files (the "Software"), to deal in the Software without
-       restriction, including without limitation the rights to use,
-       copy, modify, merge, publish, distribute, distribute with
-       modifications, sublicense, and/or sell copies of the Software,
-       and to permit persons to whom the Software is furnished to do
-       so, subject to the following conditions:
-
-       The above copyright notice and this permission notice shall be included
-       in all copies or substantial portions of the Software.
-
-       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-       KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-       WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-       PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE
-       COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-        OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-       SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-       Except as contained in this notice, the name(s) of the above
-       copyright holders shall not be used in advertising or
-       otherwise to promote the sale, use or other dealings in this
-       Software without prior written authorization.
-
-   Translations:
-       French: Copyright 2005 Yann Cézard <eesprit@free.fr>
-
-       Galician: Copyright 2006 Johám-Luís Miguéns Vila <galiza.ceivet@gmail.com>
-
-       German: Copyright 2004 Kalle Wallin, Ingmar Gebert
-
-        Norwegian: Copyright 2004, 2005
-                               Ole R. Thorsen <ole.rth@gmail.com>
-
-        Russian: Copyright 2004 Kalle Wallin,
-                               Nikolay Pavlov <quetzal@roks.biz>
-       
-       Spanish: Copyright 2004 Kalle Wallin, Ingmar Gebert
-       
\ No newline at end of file
+Sebastian Harl <sh@tokkee.org> took over maintenance on
+Fri, 22 Sep 2006 21:33:38 +0200.
+
+It was downloaded from <http://hem.bredband.net/kaw/ncmpc/files/>.
+
+Upstream Authors:
+       Kalle Wallin <kaw@linux.se>
+       Jonathan Fors <etnoy@broach.se>
+
+Copyright Holders (in alphabetical order):
+       Daniel Brown <danb@cs.utexas.edu>
+       Kalle Wallin <kaw@linux.se>
+       Warren Dukes <shank@mercury.chem.pitt.edu>
+       normalperson
+
+License:
+
+       Files po/de.po
+             po/es.po
+       Copyright (C) 2004 Kalle Wallin <kaw@linux.se>
+       Copyright (C) 2004 Ingmar Gebert
+
+       File po/fr.po
+       Copyright (C) 2005 Yann Cézard <eesprit@free.fr>
+
+       File po/gl.po
+       Copyright (C) 2006 Johám-Luís Miguéns Vila <galiza.ceivet@gmail.com>
+
+       File po/no.po
+       Copyright (C) 2004 Ole R. Thorsen <ole.rth@gmail.com>
+
+       File po/ru.po
+       Copyright (C) 2004 Kalle Wallin <kaw@linux.se>
+       Copyright (C) Nikolay Pavlov <quetzal@roks.biz>
+
+       File src/screen_clock.c is based on test/gdc.c shipped with ncurses.
+
+       File src/strfsong.c:
+       Copyright (C) 2003-2004 normalperson
+       Copyright (C) 2003-2004 Warren Dukes <shank@mercury.chem.pitt.edu>
+       Copyright (C) 2003-2004 Daniel Brown <danb@cs.utexas.edu>
+       Copyright (C) 2003-2004 Kalle Wallin <kaw@linux.se>
+
+       All other files:
+       Copyright (C) 2004 Kalle Wallin <kaw@linux.se>
+
+       This package is free software; you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation; either version 2 of the License, or
+       (at your option) any later version.
+
+       This package is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       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
+       along with this package; if not, write to the Free Software Foundation,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+On Debian systems, the complete text of the GNU General Public License 
+can be found in `/usr/share/common-licenses/GPL'.
+
+       Files src/libmpdclient.c
+             src/libmpdclient.h
+       Copyright (C) 2003-2004 Warren Dukes <shank@mercury.chem.pitt.edu>
+
+       Redistribution and use in source and binary forms, with or without
+       modification, are permitted provided that certain conditions are
+       met. See the BSD license for more details.
+
+On Debian systems, the complete text of the BSD License v2
+can be found in `/usr/share/common-licenses/BSD'.
+
+The Debian packaging is (C) 2005, 2006 René van Bevern <rvb@progn.org> 
+and (C) 2006 Sebastian Harl <sh@tokkee.org> and is licensed under the
+GPL, see above.
+