Fix packaging

diff --git a/debian/control b/debian/control
index c970b0df5afa9b7efbef9d33cddab5af6fdab88e..d57c339c54576d0d7df1dbeea31e359518c5c968 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: debhelper (>= 11), dh-exec,
               freeglut3-dev, 
               libxmu-dev,
               libxi-dev,
+              libpcap-dev,
               libvtk7-qt-dev [!armel !armhf]
 Build-Depends-Indep: doxygen,
                     doxygen-latex

diff --git a/debian/copyright b/debian/copyright
index 404dd17152bf76c9154b195c24f8974753c4f8e0..9e7c97389ee559199580c11048275ccd60bed109 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -158,7 +158,32 @@ License: BSD-2-clause
  POSSIBILITY OF SUCH DAMAGE.
 
 License: BSD-3-clause
- See /usr/share/common-licenses/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 copyright holder(s) 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 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: CC-BY-SA3.0
  .

diff --git a/debian/libpcl-doc.docs b/debian/libpcl-doc.docs
index 52675725d65c50afd9712070e264d90daf594229..ed2b9e98bdbf261708315f7f0e3c088fd5ef527a 100644 (file)
--- a/debian/libpcl-doc.docs
+++ b/debian/libpcl-doc.docs
@@ -1 +1 @@
-debian/tmp/usr/share/doc/pcl-1.8/html
+debian/tmp/usr/share/doc/pcl-*/html

diff --git a/debian/rules b/debian/rules
index 6492260d25ce3983dd25b8f8bf9da90456c84e81..f99cfd300892abaf76d4fd908b974f03fcba86fd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -73,16 +73,16 @@ override_dh_install:
 #      dh_shlibdeps -v -Xusr/bin/pcl_* -Lpcl-tools -l:$(CURDIR)/debian/usr/lib/${DEB_HOST_MULTIARCH}/cloud_composer_plugins: -ppcl --- -xpcl-tools -v
 
 override_dh_installchangelogs:
-       dh_installchangelogs -plibpcl-common1.8 CHANGES.md
+       dh_installchangelogs -plibpcl-common1.9 CHANGES.md
        # Creating dh_links to share the same file
-       @for i in libpcl-dev libpcl1.8 libpcl-apps1.8 \
-               libpcl-features1.8 libpcl-filters1.8 libpcl-io1.8 libpcl-kdtree1.8 \
-               libpcl-keypoints1.8 libpcl-octree1.8 libpcl-outofcore1.8 libpcl-people1.8 \
-               libpcl-recognition1.8 libpcl-registration1.8 libpcl-sample-consensus1.8 \
-               libpcl-search1.8 libpcl-segmentation1.8 libpcl-stereo1.8 \
-               libpcl-surface1.8 libpcl-tracking1.8 libpcl-visualization1.8 \
+       @for i in libpcl-dev libpcl1.9 libpcl-apps1.9 \
+               libpcl-features1.9 libpcl-filters1.9 libpcl-io1.9 libpcl-kdtree1.9 \
+               libpcl-keypoints1.9 libpcl-octree1.9 libpcl-outofcore1.9 libpcl-people1.9 \
+               libpcl-recognition1.9 libpcl-registration1.9 libpcl-sample-consensus1.9 \
+               libpcl-search1.9 libpcl-segmentation1.9 libpcl-stereo1.9 \
+               libpcl-surface1.9 libpcl-tracking1.9 libpcl-visualization1.9 \
                pcl-tools libpcl-doc; do \
-       cmd="dh_link -p$$i usr/share/doc/libpcl-common1.8/changelog.gz usr/share/doc/$$i/changelog.gz"; \
+       cmd="dh_link -p$$i usr/share/doc/libpcl-common1.9/changelog.gz usr/share/doc/$$i/changelog.gz"; \
        echo $$cmd; $$cmd; \
        done
        dh_installchangelogs