[med-svn] r19617 - trunk/packages/vxl/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-07-15 19:51:11 +0000 (Wed, 15 Jul 2015)
New Revision: 19617

Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/copyright
Log:
Fix remaining DEP5 issues


Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2015-07-15 16:43:34 UTC (rev 19616)
+++ trunk/packages/vxl/trunk/debian/changelog	2015-07-15 19:51:11 UTC (rev 19617)
@@ -1,3 +1,9 @@
+vxl (1.17.0.dfsg-3) UNRELEASED; urgency=medium
+
+  * Fix remaining DEP5 issues
+
+ -- Andreas Tille <tille at debian.org>  Wed, 15 Jul 2015 20:21:23 +0200
+
 vxl (1.17.0.dfsg-2) unstable; urgency=medium
 
   * cme fix dpkg-control

Modified: trunk/packages/vxl/trunk/debian/copyright
===================================================================
--- trunk/packages/vxl/trunk/debian/copyright	2015-07-15 16:43:34 UTC (rev 19616)
+++ trunk/packages/vxl/trunk/debian/copyright	2015-07-15 19:51:11 UTC (rev 19617)
@@ -35,24 +35,7 @@
 
 Files: v3p/rply/*
 Copyright: 2003-2005 Diego Nehab.
-License: BSD
- 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
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+License: MIT
 
 Files: contrib/rpl/rgrl/rgrl_copyright.h
 Copyright: 2002-2004 Rensselaer Polytechnic Institute
@@ -113,42 +96,10 @@
 Files: v3p/zlib/*
 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.
- .
-  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 following restrictions:
- .
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
 
 Files: v3p/geotiff/*
 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
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- 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 AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
 
 Files: core/vul/vul_ios_state.h
 Copyright: 2002, 2005 Daryle Walker
@@ -209,24 +160,8 @@
  DEALINGS IN THE SOFTWARE.
 
 Files: contrib/brl/b3p/minizip/*
-Copyright:
- Copyright (C) 1998-2005 Gilles Vollant
+Copyright: 1998-2005 Gilles Vollant
 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.
- .
- 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 following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    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.
@@ -236,6 +171,13 @@
            2007 Peter Dimov
 License: BSLv1.0
 
+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'
+
 License: BSLv1.0
  Boost Software License - Version 1.0 - August 17th, 2003
  .
@@ -261,10 +203,39 @@
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
+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
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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 AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 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'
+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.
+ .
+  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 following restrictions:
+ .
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+