[Python-modules-commits] r15993 - in packages/pyside-tools/trunk/debian (copyright)

[odyx at users.alioth.debian.org]

    Date: Friday, March 4, 2011 @ 19:33:29
  Author: odyx
Revision: 15993

Update copyright.

Modified:
  packages/pyside-tools/trunk/debian/copyright

Modified: packages/pyside-tools/trunk/debian/copyright
===================================================================
--- packages/pyside-tools/trunk/debian/copyright	2011-03-04 19:16:04 UTC (rev 15992)
+++ packages/pyside-tools/trunk/debian/copyright	2011-03-04 19:33:29 UTC (rev 15993)
@@ -1,4 +1,4 @@
-This package was debianized by Didier Raboud <didier at raboud.com> on Wed Sep 15 10:30:24 CEST 2010
+This package was debianized by Didier Raboud <odyx at debian.org> on Wed Sep 15 10:30:24 CEST 2010
 
 Upstream Authors:
 
@@ -9,8 +9,8 @@
     Copyright (C) 1992-2006 Trolltech AS. All rights reserved.
     Copyright (C) 2002-2007 Detlev Offenbach <detlev at die-offenbachs.de>
     Copyright (C) 2009 Torsten Marek
-    Copyright (C) 2009 Riverbank Computing Limited
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (C) 2009-2010 Riverbank Computing Limited
+    Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
 
 License:
 
@@ -31,41 +31,8 @@
     On Debian systems, the complete text of the GNU General Public License
     can be found in `/usr/share/common-licenses/GPL-2'.
 
-Some files are under other licenses and copyrights:
-
-pysideuic/elementtree/*
-
-  Copyright:
-
-     Copyright (C) 1999-2005 by Fredrik Lundh
-
-  License:
-
-     By obtaining, using, and/or copying this software and/or its
-     associated documentation, you agree that you have read, understood,
-     and will comply with the following terms and conditions:
-    
-     Permission to use, copy, modify, and distribute this software and
-     its associated documentation for any purpose and without fee is
-     hereby granted, provided that the above copyright notice appears in
-     all copies, and that both that copyright notice and this permission
-     notice appear in supporting documentation, and that the name of
-     Secret Labs AB or the author not be used in advertising or publicity
-     pertaining to distribution of the software without specific, written
-     prior permission.
-    
-     SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-     TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-     ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-     BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-     DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-     WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-     ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-     OF THIS SOFTWARE.
-
-
 The Debian packaging is
 
-    Copyright (C) 2010, Didier Raboud <didier at raboud.com>
+    Copyright (C) 2010-2011, Didier Raboud <odyx at debian.org>
 
-is licensed under the GPL, see `/usr/share/common-licenses/iGPL-2'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.