Update Files-Excluded to drop zlib sources

diff --git a/debian/copyright b/debian/copyright
index 2e0a6c30c5538822be52a024825203b6a7810808..a2a9e8aa6feee5a21448d94f2a16ea10a2a08944 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,29 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://github.com/PointCloudLibrary/pcl
 Files-Excluded: cuda/common/include/pcl/cuda/cutil*.h
-Comment: Copyright 1993-2010 NVIDIA Corporation.  All rights reserved.
+                surface/include/pcl/surface/3rdparty/opennurbs/crc32.h
+                surface/include/pcl/surface/3rdparty/opennurbs/deflate.h
+                surface/include/pcl/surface/3rdparty/opennurbs/inffast.h
+                surface/include/pcl/surface/3rdparty/opennurbs/inffixed.h
+                surface/include/pcl/surface/3rdparty/opennurbs/inflate.h
+                surface/include/pcl/surface/3rdparty/opennurbs/inftrees.h
+                surface/include/pcl/surface/3rdparty/opennurbs/trees.h
+                surface/include/pcl/surface/3rdparty/opennurbs/zconf.h
+                surface/include/pcl/surface/3rdparty/opennurbs/zlib.h
+                surface/include/pcl/surface/3rdparty/opennurbs/zutil.h
+                surface/src/3rdparty/opennurbs/adler32.c
+                surface/src/3rdparty/opennurbs/compress.c
+                surface/src/3rdparty/opennurbs/crc32.c
+                surface/src/3rdparty/opennurbs/deflate.c
+                surface/src/3rdparty/opennurbs/infback.c
+                surface/src/3rdparty/opennurbs/inffast.c
+                surface/src/3rdparty/opennurbs/inflate.c
+                surface/src/3rdparty/opennurbs/inftrees.c
+                surface/src/3rdparty/opennurbs/trees.c
+                surface/src/3rdparty/opennurbs/uncompr.c
+                surface/src/3rdparty/opennurbs/zutil.c
+Comment: cuda: Copyright 1993-2010 NVIDIA Corporation.  All rights reserved.
+         zlib: use Debian version
 
 Files: *
 Copyright: 2001, Addison-Wesley
@@ -59,32 +81,6 @@ Copyright: 2007, Michael Kazhdan
            2006, Michael Kazhdan and Matthew Bolitho
 License: Open-Source
 
-Files: surface/include/pcl/surface/3rdparty/opennurbs/deflate.h
-       surface/include/pcl/surface/3rdparty/opennurbs/inffast.h
-       surface/include/pcl/surface/3rdparty/opennurbs/inflate.h
-       surface/include/pcl/surface/3rdparty/opennurbs/inftrees.h
-       surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_crc.h
-       surface/include/pcl/surface/3rdparty/opennurbs/zconf.h
-       surface/include/pcl/surface/3rdparty/opennurbs/zlib.h
-       surface/include/pcl/surface/3rdparty/opennurbs/zutil.h
-       surface/src/3rdparty/opennurbs/adler32.c
-       surface/src/3rdparty/opennurbs/compress.c
-       surface/src/3rdparty/opennurbs/crc32.c
-       surface/src/3rdparty/opennurbs/deflate.c
-       surface/src/3rdparty/opennurbs/infback.c
-       surface/src/3rdparty/opennurbs/inffast.c
-       surface/src/3rdparty/opennurbs/inflate.c
-       surface/src/3rdparty/opennurbs/inftrees.c
-       surface/src/3rdparty/opennurbs/opennurbs_crc.cpp
-       surface/src/3rdparty/opennurbs/opennurbs_zlib_readme.txt
-       surface/src/3rdparty/opennurbs/readme.txt
-       surface/src/3rdparty/opennurbs/trees.c
-       surface/src/3rdparty/opennurbs/uncompr.c
-       surface/src/3rdparty/opennurbs/zutil.c
-Copyright: 1995-2005, Jean-loup Gailly
-           1995-2005, Mark Adler
-License: Zlib
-
 Files: gpu/kinfu_large_scale/tools/record_maps_rgb.cpp
        io/include/pcl/io/lzf.h
        io/src/lzf.cpp
@@ -669,22 +665,3 @@ License: OpenNURBS
  .
  openNURBS and Rhinoceros are a registered trademarks of Robert McNeel &
  Associates.
-
-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.