[med-svn] r9742 - trunk/packages/freediams/trunk/debian

Tue Feb 21 13:05:27 UTC 2012

Author: tille
Date: 2012-02-21 13:05:26 +0000 (Tue, 21 Feb 2012)
New Revision: 9742

Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/copyright
Log:
DEP5 changed in debian/copyright; closed bug about unclear licensing


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================

--- trunk/packages/freediams/trunk/debian/changelog	2012-02-21 13:02:33 UTC (rev 9741)
+++ trunk/packages/freediams/trunk/debian/changelog	2012-02-21 13:05:26 UTC (rev 9742)
@@ -2,14 +2,18 @@
 
   [ Eric Maeker ]
   * New upstream version
+    Closes: #656573
   * updating dependencies to Qt 4.7.0
   * updating man page and software descriptions
   * updating debian/copyright (specially for the free drugs database)
   * rules: libz.a is now build outside the source package
   * changing license terms of debian/* files to BSD revised
 
- -- Andreas Tille <tille at debian.org>  Thu, 17 Nov 2011 11:22:54 +0100
+  [ Andreas Tille ]
+  * debian/copyright: Some DEP5 adaptions
 
+ -- Andreas Tille <tille at debian.org>  Tue, 21 Feb 2012 13:35:39 +0100
+
 freediams (0.6.2-1) unstable; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freediams/trunk/debian/copyright
===================================================================
--- trunk/packages/freediams/trunk/debian/copyright	2012-02-21 13:02:33 UTC (rev 9741)
+++ trunk/packages/freediams/trunk/debian/copyright	2012-02-21 13:05:26 UTC (rev 9742)
@@ -25,7 +25,7 @@
 
 Files: contrib/quazip/*
 Copyright: © 2005-2007 Sergey A. Tachenov
-License: Dual licensed as GPL2+ and LGPL
+License: GPL2+ or LGPL
  This library 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
@@ -40,11 +40,9 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 Comment: On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in ‚Äò/usr/share/common-licenses/LGPL-2.1‚Äô.
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
 Remark: Here we are using LGPL to be able to link against a BSD licensed
  program
-Comment: On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
 
 Files: libs/{aggregation extensionsystem}/*
        libs/utils/{stylehelper.* qtcassert.h}
@@ -56,7 +54,7 @@
        tests/basicsortfiltermodel
        tests/formmodel/[mt]*
 Copyright: 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-License: : LGPL-2.1+
+License: LGPL-2.1+
  This library 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
@@ -75,7 +73,7 @@
 
 Files: contrib/quazip/quazip/{crypt.h ioapi.c unzip.[ch] z*}
 Copyright: 1998-2005 Gilles Vollant, Jean-loup Gailly and Mark Adler
-License: Info-ZIP license
+License: Info-ZIP
  Permission is granted to anyone to use this software for any purpose,
  including commercial applications, and to alter it and redistribute it
  freely, subject to the above disclaimer and the following restrictions:
@@ -117,8 +115,8 @@
                                     Printer.svg
                                     unadvised.svg}
 Copyright: 2006-2008 Lapo Calamandrei, Jakub Steiner, Andreas Nilsson
-License: Creative Commons 2.0 by SA
-   Attribution-ShareAlike 2.0 License
+License: CC
+   Creative Commons Attribution-ShareAlike 2.0 License
  .
    THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
    CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
@@ -364,17 +362,41 @@
        global_resources/pixmaps/48x48
        global_resources/pixmaps/64x64
 Copyright: Tango Desktop Project, Eric Maeker
-License: Public Domain
+License: PD
  These icons are in Public Domain
 
 Files: global_resources/datapacks/appinstalled/drugs/master.db
 Copyright: Eric Maeker, MD
-License: The file is created by upstream using the following database licenses
+License: PD
  This file is constructed using the following raw source files:
   - FDA drugs database: http://www.fda.gov/downloads/Drugs/InformationOnDrugs/ucm054599.zip
     License: public domain © FDA
 
 Files: debian/*
 Copyright: © 2009-2012, Eric Maeker <eric.maeker at gmail.com>
-                        Andreas Tille <tille at debian.org>
-License: BSD revised
+           Andreas Tille <tille at debian.org>
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+


