[med-svn] r19613 - in trunk/packages/vxl/trunk/debian: . source

Wed Jul 15 16:38:43 UTC 2015

Author: tille
Date: 2015-07-15 16:38:42 +0000 (Wed, 15 Jul 2015)
New Revision: 19613

Added:
   trunk/packages/vxl/trunk/debian/source/lintian-overrides
Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/copyright
Log:
DEP5 fixes and upload to unstable


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

--- trunk/packages/vxl/trunk/debian/changelog	2015-07-15 14:55:35 UTC (rev 19612)
+++ trunk/packages/vxl/trunk/debian/changelog	2015-07-15 16:38:42 UTC (rev 19613)
@@ -1,4 +1,4 @@
-vxl (1.17.0.dfsg-2) UNRELEASED; urgency=medium
+vxl (1.17.0.dfsg-2) unstable; urgency=medium
 
   * cme fix dpkg-control
   * Apply patch from fedora (Thanks to Brett Johnson <brett at hp.com> for
@@ -7,8 +7,9 @@
   * Unset Cmake variables on configuration change (thanks for the patch to
     Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>)
     Closes: #788559
+  * DEP5 fixes
 
- -- Andreas Tille <tille at debian.org>  Wed, 15 Jul 2015 15:33:32 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 15 Jul 2015 17:11:41 +0200
 
 vxl (1.17.0.dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/vxl/trunk/debian/copyright
===================================================================
--- trunk/packages/vxl/trunk/debian/copyright	2015-07-15 14:55:35 UTC (rev 19612)
+++ trunk/packages/vxl/trunk/debian/copyright	2015-07-15 16:38:42 UTC (rev 19613)
@@ -33,7 +33,7 @@
  USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-Files: v3p/rply/
+Files: v3p/rply/*
 Copyright: 2003-2005 Diego Nehab.
 License: BSD
  Permission is hereby granted, free of charge, to any person obtaining a
@@ -92,7 +92,7 @@
  Copyright (c) 1993,94,95,96
  Institute for Information Processing and Computer Supported New Media (IICM),
  Graz University of Technology, Austria.
-License:
+License: VRweb
  This file is part of VRweb.
  .
  VRweb is free software; you can redistribute it and/or modify
@@ -111,9 +111,8 @@
  Boston, MA 02110-1301, USA.
 
 Files: v3p/zlib/*
-Copyright:
-  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-License:
+Copyright: 1995-2002 Jean-loup Gailly and Mark Adler
+License: zlib
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
   arising from the use of this software.
@@ -130,17 +129,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
-Files: v3p/mpeg2/libmpeg2/*
-Copyright:
- Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
- Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
-License: GPL (v2 or later)
- On debian system the license can be found in `/usr/share/common-licenses/GPL-2'
-
 Files: v3p/geotiff/*
-Copyright:
- Copyright (c) 1999, Frank Warmerdam
-License:
+Copyright: 1999, Frank Warmerdam
+License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
  to deal in the Software without restriction, including without limitation
@@ -160,9 +151,8 @@
  DEALINGS IN THE SOFTWARE.
 
 Files: core/vul/vul_ios_state.h
-Copyright:
- Copyright 2002, 2005 Daryle Walker
-License:
+Copyright: 2002, 2005 Daryle Walker
+License: Boost
  Boost Software License - Version 1.0 - August 17th, 2003
  .
  Permission is hereby granted, free of charge, to any person or organization
@@ -190,30 +180,7 @@
 Files: contrib/rpl/rgrl/*
 Copyright:
  Copyright 2006-2009 Brad King, Chuck Stewart
-License: BSL (v1.0)
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+License: BSLv1.0
 
 Files: contrib/brl/b3p/shapelib/*
 Copyright:
@@ -261,24 +228,15 @@
     misrepresented as being the original software.
  3. This notice may not be removed or altered from any source distribution.
 
+Files: vcl/internal/* vcl/vcl_atomic_count.h
+Copyright: 2001, 2002 Peter Dimov and Multi Media Ltd.
+           2002 Lars Gullik Bjønnes <larsbj at lyx.org>
+           2006 Michael van der Westhuizen
+           2001-2005 Peter Dimov
+           2007 Peter Dimov
+License: BSLv1.0
 
-Files: vidl_vil1/vidl_vil1_mpegcodec.cxx
- vidl1/vidl1_mpegcodec.cxx
-Copyright:
- Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
- Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
-License: GPL-2+
- On debian system the license can be found in `/usr/share/common-licenses/GPL-2'
-
-Files: vcl/internal/*
- vcl_atomic_count.h
-Copyright:
- Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
- Copyright (c) 2002 Lars Gullik Bjønnes <larsbj at lyx.org>
- Copyright (c) 2006 Michael van der Westhuizen
- Copyright (c) 2001-2005 Peter Dimov
- Copyright 2007 Peter Dimov
-License: BSL (v1.0)
+License: BSLv1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  .
  Permission is hereby granted, free of charge, to any person or organization
@@ -303,8 +261,10 @@
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
+
 Files: debian/*
 Copyright: 2009-2012, Mathieu Malaterre <malat at debian.org>
+           2014-2014, Andreas Tille <tille at debian.org>
 License: GPL-2+
  The Debian packaging is licensed under the GPL-2 or any later version,
  see `/usr/share/common-licenses/GPL-2'

Added: trunk/packages/vxl/trunk/debian/source/lintian-overrides
===================================================================
--- trunk/packages/vxl/trunk/debian/source/lintian-overrides	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/source/lintian-overrides	2015-07-15 16:38:42 UTC (rev 19613)
@@ -0,0 +1,4 @@
+# While the name of this file might lead to the consequence that it is th
+# copyrighted original, this small part of a heavily processed image is
+# hardly conflicting with any copyright
+vxl source: license-problem-non-free-img-lenna core/doc/book/lena.png


