[med-svn] r17977 - trunk/packages/dicompyler/trunk/debian

Wed Sep 10 16:17:24 UTC 2014

Author: tille
Date: 2014-09-10 16:17:24 +0000 (Wed, 10 Sep 2014)
New Revision: 17977

Modified:
   trunk/packages/dicompyler/trunk/debian/changelog
   trunk/packages/dicompyler/trunk/debian/copyright
Log:
Fixed several DEP5 issues uncovered by lintian


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

--- trunk/packages/dicompyler/trunk/debian/changelog	2014-09-10 13:23:45 UTC (rev 17976)
+++ trunk/packages/dicompyler/trunk/debian/changelog	2014-09-10 16:17:24 UTC (rev 17977)
@@ -6,6 +6,7 @@
   * Adapt to new installation location suggested for Python applications
   * Fix wrapper
   * Provide properly sized icon in proper dir
+  * debian/copyright: Fixed several DEP5 issues uncovered by lintian
 
  -- Andreas Tille <tille at debian.org>  Sat, 06 Sep 2014 15:57:29 +0200
 

Modified: trunk/packages/dicompyler/trunk/debian/copyright
===================================================================
--- trunk/packages/dicompyler/trunk/debian/copyright	2014-09-10 13:23:45 UTC (rev 17976)
+++ trunk/packages/dicompyler/trunk/debian/copyright	2014-09-10 16:17:24 UTC (rev 17977)
@@ -1,45 +1,20 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Dicompyler
 Upstream-Contact: Aditya Panchal <apanchal at bastula.org>
 Source: http://code.google.com/p/dicompyler/
 
 Files: *
-Copyright: © 2005-2011 Aditya Panchal <apanchal at bastula.org>
+Copyright: © 2005-2014 Aditya Panchal <apanchal at bastula.org>
            © 2009-2010 Roy Keyes
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-    Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
-    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.
- .
-    The name of Aditya Panchal may not be used to endorse or promote
-    products derived from this software without specific prior written
-    permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER
- 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.
+License: BSD-3-clause
 
-Files: resources/*
+Files: dicompyler/resources/*
 Copyright: © 2008-2011 Mark James
-License: The famfamfam Silk icon set created by Mark James can be found at
-	http://famfamfam.com/lab/icons/silk/ and is licensed under the
-	Creative Commons Attribution 2.5 License (or 3.0).
+License: CC-BY-SA
+ The famfamfam Silk icon set created by Mark James can be found at
+ http://famfamfam.com/lab/icons/silk/ and is licensed under the
+ Creative Commons Attribution 2.5 License (or 3.0).
+ .
  You are free:
     * to Share — to copy, distribute and transmit the work
     * to Remix — to adapt the work
@@ -368,7 +343,7 @@
        included in the License; this License is not intended to restrict
        the license of any rights under applicable law.
 
-Files: wxmpl.py
+Files: dicompyler/wxmpl.py
 Copyright: © 2005-2009 Ken McIvor <mcivor at iit.edu> (Illinois Institute
                        of Technology)
 License: BSD-like
@@ -396,8 +371,35 @@
  the sale, use or other dealings in this Software without prior written
  authorization from Illinois Institute of Technology.
 
+Files: debian/*
+Copyright: © 2011-2014 Andreas Tille <tille at debian.org>
+License: BSD-3-clause
 
-Files: debian/*
-Copyright: © 2011 Andreas Tille <tille at debian.org>
-License: BSD
- Same as dicompyler itself
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+    Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+    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.
+ .
+    The name of Aditya Panchal may not be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER
+ 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.


