r9086 - packages/trunk/tpclient-pywx/debian

[Barry deFreese]

Author: bdefreese
Date: 2009-03-09 16:13:09 +0000 (Mon, 09 Mar 2009)
New Revision: 9086

Modified:
   packages/trunk/tpclient-pywx/debian/changelog
   packages/trunk/tpclient-pywx/debian/copyright
Log:
Fix up debian/copyright issues.
Refresh changelog.


Modified: packages/trunk/tpclient-pywx/debian/changelog
===================================================================
--- packages/trunk/tpclient-pywx/debian/changelog	2009-03-09 15:18:12 UTC (rev 9085)
+++ packages/trunk/tpclient-pywx/debian/changelog	2009-03-09 16:13:09 UTC (rev 9086)
@@ -5,4 +5,4 @@
   * Add quilt patch system
   * 01_setup.diff - Graphicsdir not being created.
 
- -- Barry deFreese <bdefreese at debian.org>  Tue, 16 Dec 2008 12:33:23 -0500
+ -- Barry deFreese <bdefreese at debian.org>  Mon, 09 Mar 2009 12:12:47 -0400

Modified: packages/trunk/tpclient-pywx/debian/copyright
===================================================================
--- packages/trunk/tpclient-pywx/debian/copyright	2009-03-09 15:18:12 UTC (rev 9085)
+++ packages/trunk/tpclient-pywx/debian/copyright	2009-03-09 16:13:09 UTC (rev 9086)
@@ -9,13 +9,67 @@
 Copyright: Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2007 Tim Ansell <mithro at mithis.com>
 
 extra/wxFloatCanvas/FloatCanvas.py and
-extra/wxFloatCanvas/__init__.py are Copyright (c) Christopher Barker <Chris.Barker at noaa.gov>
+extra/wxFloatCanvas/__init__.py are Copyright (C) Christopher Barker <Chris.Barker at noaa.gov>
 
-extra/wxFloatCanvas/NavCanvas.py is Copyright (c)
+extra/wxFloatCanvas/NavCanvas.py is Copyright (C)
 	wxWindows Software Foundation (Assigned by: Christopher Barker <Chris.Barker at noaa.gov>)
 
 License:
 
+extra/wxFloatCanvas/* and extra/PyAUI.py wxWindows license:
+
+    Copyright (c) 1998 Julian Smart, Robert Roebling [, ...]
+
+    Everyone is permitted to copy and distribute verbatim copies
+    of this licence document, but changing it is not allowed.
+
+    WXWINDOWS LIBRARY LICENCE
+
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public Licence as published by
+    the Free Software Foundation; either version 2 of the Licence, or (at
+    your option) any later version.
+
+    This library 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 Library
+    General Public Licence for more details.
+
+    You should have received a copy of the GNU Library General Public Licence
+    along with this software, usually in a file named COPYING.LIB. If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+    Boston, MA 02111-1307 USA.
+
+    EXCEPTION NOTICE
+
+    1. As a special exception, the copyright holders of this library give
+    permission for additional uses of the text contained in this release of
+    the library as licenced under the wxWindows Library Licence, applying
+    either version 3 of the Licence, or (at your option) any later version of
+    the Licence as published by the copyright holders of version 3 of the
+    Licence document.
+
+    2. The exception is that you may use, copy, link, modify and distribute
+    under the user's own terms, binary object code versions of works based
+    on the Library.
+
+    3. If you copy code from files distributed under the terms of the GNU
+    General Public Licence or the GNU Library General Public Licence into a
+    copy of this library, as this licence permits, the exception does not
+    apply to the code that you add in this way. To avoid misleading anyone as
+    to the status of such modified files, you must delete this exception
+    notice from such code and/or adjust the licensing conditions notice
+    accordingly.
+
+    4. If you write modifications of your own for this library, it is your
+    choice whether to permit this exception to apply to your modifications.
+    If you do not wish that, you must delete the exception notice from such
+    code and/or adjust the licensing conditions notice accordingly.
+
+All others GPL v2 or later:
+
     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
     the Free Software Foundation; either version 2 of the License, or
@@ -34,5 +88,4 @@
     Public License can be found in the /usr/share/common-licenses/GPL file.
 
 The Debian packaging is (C) 2007, Barry deFreese <bddebian at comcast.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.