[Pkg-voip-commits] r4966 - in /kphone/trunk/debian: changelog copyright

[msp at alioth.debian.org]

Author: msp
Date: Sat Dec  1 12:00:21 2007
New Revision: 4966

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4966
Log:
* Update debian/copyright

Modified:
    kphone/trunk/debian/changelog
    kphone/trunk/debian/copyright

Modified: kphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/changelog?rev=4966&op=diff
==============================================================================
--- kphone/trunk/debian/changelog (original)
+++ kphone/trunk/debian/changelog Sat Dec  1 12:00:21 2007
@@ -20,6 +20,7 @@
   * mandir.patch to honour ./configure --mandir=DIR
   * Fix kphone.menu to use /usr/bin/kpsi
   * cleanup syntax-error-in-debian-news-file
+  * Update debian/copyright
 
   [ Kilian Krause ]
   * Update menu to "Applications" rather than "Apps"

Modified: kphone/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/kphone/trunk/debian/copyright?rev=4966&op=diff
==============================================================================
--- kphone/trunk/debian/copyright (original)
+++ kphone/trunk/debian/copyright Sat Dec  1 12:00:21 2007
@@ -1,40 +1,56 @@
 This package was debianized by Mark Purcell <msp at debian.org> on
 Sun,  9 Feb 2003 15:10:14 +1100.
 
-It was downloaded from http://www.wirlab.net/kphone/
+It was downloaded from http://ovh.dl.sourceforge.net/kphone/kphoneSI_1.1.tar.gz
 
-Upstream Authors:	Billy Biggs <vektor at div8.net>
-			Pekka Raisio
-			Jouni Vuorela
-			Juha Heinanen
-			Mika Mustikkamaki <mika.mustikkamaki at wirlab.net>
+Upstream Authors:	
+	Klaus Fleischmann <kgfleischmann at t-online.de>
+
+Copyright:
+
+	2000 Billy Biggs <bbiggs at div8.net> 
+ 	2004 Wirlab <kphone at wirlab.net> 
+	2006 Kphone Team <kphone-devel at lists.sourceforge.net>]
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
 
 Note: "This program is released under the GPL with the additional
 exemption that compiling, linking, and/or using OpenSSL is allowed."
 
-Copyright:
-
-Copyright (c) 2000 Billy Biggs <bbiggs at div8.net>
-Copyright (c) 2004 Wirlab <kphone at wirlab.net>
-
-   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; version 2 dated June, 1991.
-
-   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, Inc., 
-   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
+On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
+The Debian packaging is (C) 2003-2007, Mark Purcell <msp at debian.org> and
+is licensed under the GPL, see above.
+
 Other portions of code:
-dissipate2/base64.c: * Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-gsm/*: * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
-ilbc/*:       Copyright (C) The Internet Society (2004).
-kphone/trayicon.cpp:   Copyright (C) 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved.
+
+dissipate2/: Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
+
+gsm/*:  Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+ilbc/*:  Copyright (C) The Internet Society (2004).
+
+kphone/trayicon.h: GPL (v2 or later) (with incorrect FSF address) 
+  [Copyright: 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved]
+
+Speex/: BSD (3 clause) 
+  [Copyright: HOLDERS AND CONTRIBUTORS / 2002 Jean-Marc Valin & David Rowe]
+Speex/lpc1.cpp: BSD (3 clause) 
+  [Copyright: HOLDERS AND CONTRIBUTORS / 1992, 1993, 1994 by Jutta Degener and Carsten Bormann]