From a20a5d145d50072037fa5de97df85bf464dd5d77 Mon Sep 17 00:00:00 2001
From: Olivier Sallou <osallou@debian.org>
Date: Wed, 27 Dec 2017 09:47:11 +0000
Subject: [PATCH] update upstream to 3.1.0
---
debian/README.Debian | 3 +-
debian/changelog | 12 +-
debian/control | 320 +++++++++++-------
debian/copyright | 113 ++++++-
debian/libvisp-ar3.1.install | 3 +
debian/libvisp-blob3.1.install | 1 +
debian/libvisp-core3.1.install | 1 +
debian/libvisp-detection3.1.install | 1 +
debian/libvisp-doc.lintian-overrides | 1 +
debian/libvisp-gui3.1.install | 1 +
debian/libvisp-imgproc-dev.install | 5 +
debian/libvisp-imgproc3.1.install | 3 +
debian/libvisp-io3.1.install | 1 +
debian/libvisp-klt3.1.install | 1 +
debian/libvisp-mbt3.1.install | 1 +
debian/libvisp-me3.1.install | 1 +
debian/libvisp-robot3.1.install | 3 +
debian/libvisp-sensor3.1.install | 1 +
debian/libvisp-tt-mi3.1.install | 1 +
debian/libvisp-tt3.1.install | 1 +
debian/libvisp-vision3.1.install | 1 +
debian/libvisp-visual-features3.1.install | 1 +
debian/libvisp-vs3.1.install | 1 +
.../0001-Turn-rpath-off-for-install.patch | 10 +-
debian/rules | 68 +---
25 files changed, 355 insertions(+), 200 deletions(-)
create mode 100644 debian/libvisp-ar3.1.install
create mode 100644 debian/libvisp-blob3.1.install
create mode 100644 debian/libvisp-core3.1.install
create mode 100644 debian/libvisp-detection3.1.install
create mode 100644 debian/libvisp-gui3.1.install
create mode 100644 debian/libvisp-imgproc-dev.install
create mode 100644 debian/libvisp-imgproc3.1.install
create mode 100644 debian/libvisp-io3.1.install
create mode 100644 debian/libvisp-klt3.1.install
create mode 100644 debian/libvisp-mbt3.1.install
create mode 100644 debian/libvisp-me3.1.install
create mode 100644 debian/libvisp-robot3.1.install
create mode 100644 debian/libvisp-sensor3.1.install
create mode 100644 debian/libvisp-tt-mi3.1.install
create mode 100644 debian/libvisp-tt3.1.install
create mode 100644 debian/libvisp-vision3.1.install
create mode 100644 debian/libvisp-visual-features3.1.install
create mode 100644 debian/libvisp-vs3.1.install
diff --git a/debian/README.Debian b/debian/README.Debian
index c5f2938e..6cc0bd85 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,7 +11,8 @@ reality capabilities are not used.
- libvisp-core*
- libvisp-detection*
- libvisp-gui*
- - libvisp-io
+ - libvisp-imgproc*
+ - libvisp-io*
- libvisp-klt*
- libvisp-me*
- libvisp-mbt*
diff --git a/debian/changelog b/debian/changelog
index fb386127..99340c11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-visp (3.1.0-1) UNRELEASED; urgency=medium
+visp (3.1.0-1) unstable; urgency=medium
- * New upstream release
+ * Remove 3.0.1 patches
+ * New upstream version 3.1.0
+ * Update debian material for visp 3.1.0
+ Fix debian issues: Closes: #856703, #878937, #871414
+ * Add patches for visp 3.1.0
+ * Add libvisp-imgproc-dev
+ * Fix lintian warnings
- -- Olivier Sallou <osallou@debian.org> Wed, 27 Dec 2017 06:57:32 +0000
+ -- Fabien Spindler <Fabien.Spindler@inria.fr> Tue, 26 Dec 2017 14:37:33 +0100
visp (3.0.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 941a866a..0d03f3b9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,51 +2,52 @@ Source: visp
Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
Uploaders: Olivier Sallou <osallou@debian.org>, Fabien Spindler <Fabien.Spindler@inria.fr>
Section: libs
-Priority: extra
+Priority: optional
Build-Depends: debhelper (>= 9),
cmake,
doxygen,
- libopencv-dev,
- liblapack-dev,
- libgsl-dev,
libcoin80-dev,
- libsoqt4-dev,
libdc1394-22-dev [linux-any],
- libv4l-dev [!hurd-any],
- libfreenect-dev [!hurd-any !kfreebsd-any],
- libxml2-dev,
+ libdmtx-dev,
+ libeigen3-dev,
+ libgsl-dev,
libjpeg-dev,
+ liblapack-dev,
+ libogre-1.9-dev,
+ libopencv-dev,
libpng-dev,
+ libsoqt4-dev,
+ libv4l-dev [linux-any],
libx11-dev,
+ libxml2-dev,
libzbar-dev,
- libdmtx-dev,
- libogre-1.9-dev,
visp-images-data
Standards-Version: 4.1.2
Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/visp.git
-Vcs-Git: https://anonscm.debian.org/debian-science/packages/visp.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/visp.git
Homepage: https://visp.inria.fr
Package: libvisp-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
+ libvisp-ar-dev (= ${binary:Version}),
+ libvisp-blob-dev (= ${binary:Version}),
libvisp-core-dev (= ${binary:Version}),
+ libvisp-detection-dev (= ${binary:Version}),
libvisp-gui-dev (= ${binary:Version}),
libvisp-io-dev (= ${binary:Version}),
- libvisp-detection-dev (= ${binary:Version}),
- libvisp-ar-dev (= ${binary:Version}),
- libvisp-blob-dev (= ${binary:Version}),
- libvisp-me-dev (= ${binary:Version}),
+ libvisp-imgproc-dev (= ${binary:Version}),
libvisp-klt-dev (= ${binary:Version}),
- libvisp-sensor-dev (= ${binary:Version}),
+ libvisp-mbt-dev (= ${binary:Version}),
+ libvisp-me-dev (= ${binary:Version}),
libvisp-robot-dev (= ${binary:Version}),
+ libvisp-sensor-dev (= ${binary:Version}),
+ libvisp-tt-dev (= ${binary:Version}),
+ libvisp-tt-mi-dev (= ${binary:Version}),
libvisp-visual-features-dev (= ${binary:Version}),
libvisp-vision-dev (= ${binary:Version}),
- libvisp-vs-dev (= ${binary:Version}),
- libvisp-mbt-dev (= ${binary:Version}),
- libvisp-tt-dev (= ${binary:Version}),
- libvisp-tt-mi-dev (= ${binary:Version})
+ libvisp-vs-dev (= ${binary:Version})
Suggests: libvisp-doc
Description: development files for ViSP
This is a metapackage providing development package necessary for
@@ -68,10 +69,11 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- libvisp-core3.0 (= ${binary:Version}),
- libopencv-dev,
- liblapack-dev,
+ libvisp-core3.1 (= ${binary:Version}),
+ libeigen3-dev,
libgsl-dev,
+ liblapack-dev,
+ libopencv-dev,
libxml2-dev
Description: development files for libvisp-core
This package contains the header files and static library needed to compile
@@ -88,7 +90,7 @@ Description: development files for libvisp-core
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-core3.0
+Package: libvisp-core3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -107,11 +109,11 @@ Description: visual servoing platform core library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-core3.0-dbg
+Package: libvisp-core3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-core3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-core3.0
+Depends: ${misc:Depends}, libvisp-core3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-core3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) core library.
.
@@ -132,7 +134,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-gui3.0 (= ${binary:Version}),
+ libvisp-gui3.1 (= ${binary:Version}),
libx11-dev
Description: development files for libvisp-gui
This package contains the header files and static library needed to compile
@@ -150,12 +152,12 @@ Description: development files for libvisp-gui
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-gui3.0
+Package: libvisp-gui3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform gui library
This package contains the ViSP (Visual Servoing Platform) graphical user
interface (GUI) runtime library.
@@ -171,11 +173,11 @@ Description: visual servoing platform gui library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-gui3.0-dbg
+Package: libvisp-gui3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-gui3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-gui3.0
+Depends: ${misc:Depends}, libvisp-gui3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-gui3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) graphical user interface library.
.
@@ -190,13 +192,76 @@ Description: Debugging symbol for libvisp-gui3.0
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
+Package: libvisp-imgproc-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+ libvisp-core-dev (= ${binary:Version}),
+ libvisp-imgproc3.1 (= ${binary:Version})
+Description: development files for libvisp-imgproc
+ This package contains the header files and static library needed to compile
+ applications that use ViSP (Visual Servoing Platform) image processing
+ library.
+ .
+ ViSP standing for Visual Servoing Platform is a modular cross
+ platform library that allows prototyping and developing applications
+ using visual tracking and visual servoing technics at the heart of the
+ researches done by Inria Lagadic team. ViSP is able to compute control
+ laws that can be applied to robotic systems. It provides a set of visual
+ features that can be tracked using real time image processing or computer
+ vision algorithms. ViSP provides also simulation capabilities.
+ .
+ ViSP can be useful in robotics, computer vision, augmented reality and
+ computer animation.
+
+Package: libvisp-imgproc3.1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ libvisp-core3.1 (= ${binary:Version})
+Description: visual servoing platform imgproc library
+ This package contains the ViSP (Visual Servoing Platform) image processing
+ runtime library.
+ .
+ ViSP standing for Visual Servoing Platform is a modular cross
+ platform library that allows prototyping and developing applications
+ using visual tracking and visual servoing technics at the heart of the
+ researches done by Inria Lagadic team. ViSP is able to compute control
+ laws that can be applied to robotic systems. It provides a set of visual
+ features that can be tracked using real time image processing or computer
+ vision algorithms. ViSP provides also simulation capabilities.
+ .
+ ViSP can be useful in robotics, computer vision, augmented reality and
+ computer animation.
+
+Package: libvisp-imgproc3.1-dbg
+Section: debug
+Architecture: any
+Depends: ${misc:Depends}, libvisp-imgproc3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-imgproc3.1
+ This package contains detached debugging symbol for ViSP
+ (Visual Servoing Platform) image processing library.
+ .
+ ViSP standing for Visual Servoing Platform is a modular cross
+ platform library that allows prototyping and developing applications
+ using visual tracking and visual servoing technics at the heart of the
+ researches done by Inria Lagadic team. ViSP is able to compute control
+ laws that can be applied to robotic systems. It provides a set of visual
+ features that can be tracked using real time image processing or computer
+ vision algorithms. ViSP provides also simulation capabilities.
+ .
+ ViSP can be useful in robotics, computer vision, augmented reality and
+ computer animation.
+
Package: libvisp-io-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-io3.0 (= ${binary:Version}),
+ libvisp-io3.1 (= ${binary:Version}),
libjpeg-dev,
libpng-dev
Description: development files for libvisp-io
@@ -215,12 +280,12 @@ Description: development files for libvisp-io
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-io3.0
+Package: libvisp-io3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform io library
This package contains the ViSP (Visual Servoing Platform) input/output
(io) runtime library.
@@ -236,11 +301,11 @@ Description: visual servoing platform io library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-io3.0-dbg
+Package: libvisp-io3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-io3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-io3.0
+Depends: ${misc:Depends}, libvisp-io3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-io3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) input/output library.
.
@@ -261,7 +326,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-detection3.0 (= ${binary:Version}),
+ libvisp-detection3.1 (= ${binary:Version}),
libzbar-dev,
libdmtx-dev
Description: development files for libvisp-detection
@@ -280,12 +345,12 @@ Description: development files for libvisp-detection
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-detection3.0
+Package: libvisp-detection3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform detection library
This package contains the ViSP (Visual Servoing Platform) detection
runtime library.
@@ -301,11 +366,11 @@ Description: visual servoing platform detection library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-detection3.0-dbg
+Package: libvisp-detection3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-detection3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-detection3.0
+Depends: ${misc:Depends}, libvisp-detection3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-detection3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) detection library.
.
@@ -327,7 +392,7 @@ Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
libvisp-io-dev (= ${binary:Version}),
- libvisp-ar3.0 (= ${binary:Version}),
+ libvisp-ar3.1 (= ${binary:Version}),
libcoin80-dev,
libsoqt4-dev,
libogre-1.9-dev [!any-sh4] | libogre-dev [!any-sh4],
@@ -348,13 +413,13 @@ Description: development files for libvisp-ar
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-ar3.0
+Package: libvisp-ar3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version}),
- libvisp-io3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version}),
+ libvisp-io3.1 (= ${binary:Version})
Description: visual servoing platform ar library
This package contains the ViSP (Visual Servoing Platform) augmented reality
(ar) runtime library.
@@ -370,11 +435,11 @@ Description: visual servoing platform ar library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-ar3.0-dbg
+Package: libvisp-ar3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-ar3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-ar3.0
+Depends: ${misc:Depends}, libvisp-ar3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-ar3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) augmented reality library.
.
@@ -395,7 +460,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-blob3.0 (= ${binary:Version})
+ libvisp-blob3.1 (= ${binary:Version})
Description: development files for libvisp-blob
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) blob tracking
@@ -412,12 +477,12 @@ Description: development files for libvisp-blob
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-blob3.0
+Package: libvisp-blob3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform blob tracking library
This package contains the ViSP (Visual Servoing Platform) blob tracking
runtime library.
@@ -433,11 +498,11 @@ Description: visual servoing platform blob tracking library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-blob3.0-dbg
+Package: libvisp-blob3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-blob3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-blob3.0
+Depends: ${misc:Depends}, libvisp-blob3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-blob3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) blob tracking library.
.
@@ -458,7 +523,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-me3.0 (= ${binary:Version})
+ libvisp-me3.1 (= ${binary:Version})
Description: development files for libvisp-me
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) moving edges tracking
@@ -475,12 +540,12 @@ Description: development files for libvisp-me
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-me3.0
+Package: libvisp-me3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform me tracking library
This package contains the ViSP (Visual Servoing Platform) moving edges
(me) tracking runtime library.
@@ -496,11 +561,11 @@ Description: visual servoing platform me tracking library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-me3.0-dbg
+Package: libvisp-me3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-me3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-me3.0
+Depends: ${misc:Depends}, libvisp-me3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-me3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) moving edges tracking library.
.
@@ -521,7 +586,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-klt3.0 (= ${binary:Version})
+ libvisp-klt3.1 (= ${binary:Version})
Description: development files for libvisp-klt
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) Lucas-Kanade-Tomasi
@@ -538,12 +603,12 @@ Description: development files for libvisp-klt
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-klt3.0
+Package: libvisp-klt3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform klt tracking library
This package contains the ViSP (Visual Servoing Platform)
Lucas-Kanade-Tomasi (klt) tracking library runtime library.
@@ -559,11 +624,11 @@ Description: visual servoing platform klt tracking library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-klt3.0-dbg
+Package: libvisp-klt3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-klt3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-klt3.0
+Depends: ${misc:Depends}, libvisp-klt3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-klt3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) Lucas-Kanade-Tomasi tracking library.
.
@@ -584,11 +649,10 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-core-dev (= ${binary:Version}),
- libvisp-sensor3.0 (= ${binary:Version}),
+ libvisp-sensor3.1 (= ${binary:Version}),
libdc1394-22-dev [linux-any],
libv4l-dev [linux-any],
- libusb-dev,
- libfreenect-dev [!hurd-any]
+ libusb-dev
Description: development files for libvisp-sensor
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) sensor library.
@@ -604,12 +668,12 @@ Description: development files for libvisp-sensor
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-sensor3.0
+Package: libvisp-sensor3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-core3.0 (= ${binary:Version})
+ libvisp-core3.1 (= ${binary:Version})
Description: visual servoing platform sensor library
This package contains the ViSP (Visual Servoing Platform) sensor
runtime library.
@@ -625,11 +689,11 @@ Description: visual servoing platform sensor library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-sensor3.0-dbg
+Package: libvisp-sensor3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-sensor3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-sensor3.0
+Depends: ${misc:Depends}, libvisp-sensor3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-sensor3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) sensor library.
.
@@ -651,7 +715,7 @@ Multi-Arch: same
Depends: ${misc:Depends},
libvisp-gui-dev (= ${binary:Version}),
libvisp-io-dev (= ${binary:Version}),
- libvisp-robot3.0 (= ${binary:Version})
+ libvisp-robot3.1 (= ${binary:Version})
Description: development files for libvisp-robot
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) robot library.
@@ -667,13 +731,13 @@ Description: development files for libvisp-robot
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-robot3.0
+Package: libvisp-robot3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-gui3.0 (= ${binary:Version}),
- libvisp-io3.0 (= ${binary:Version})
+ libvisp-gui3.1 (= ${binary:Version}),
+ libvisp-io3.1 (= ${binary:Version})
Description: visual servoing platform robot library
This package contains the ViSP (Visual Servoing Platform) robot
runtime library.
@@ -689,11 +753,11 @@ Description: visual servoing platform robot library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-robot3.0-dbg
+Package: libvisp-robot3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-robot3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-robot3.0
+Depends: ${misc:Depends}, libvisp-robot3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-robot3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) robot library.
.
@@ -715,7 +779,7 @@ Multi-Arch: same
Depends: ${misc:Depends},
libvisp-blob-dev (= ${binary:Version}),
libvisp-me-dev (= ${binary:Version}),
- libvisp-visual-features3.0 (= ${binary:Version})
+ libvisp-visual-features3.1 (= ${binary:Version})
Description: development files for libvisp-visual-features
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) visual features
@@ -732,13 +796,13 @@ Description: development files for libvisp-visual-features
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-visual-features3.0
+Package: libvisp-visual-features3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-blob3.0 (= ${binary:Version}),
- libvisp-me3.0 (= ${binary:Version})
+ libvisp-blob3.1 (= ${binary:Version}),
+ libvisp-me3.1 (= ${binary:Version})
Description: visual servoing platform visual-features library
This package contains the ViSP (Visual Servoing Platform) visual features
runtime library.
@@ -754,11 +818,11 @@ Description: visual servoing platform visual-features library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-visual-features3.0-dbg
+Package: libvisp-visual-features3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-visual-features3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-visual-features3.0
+Depends: ${misc:Depends}, libvisp-visual-features3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-visual-features3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) visual features library.
.
@@ -780,7 +844,7 @@ Multi-Arch: same
Depends: ${misc:Depends},
libvisp-io-dev (= ${binary:Version}),
libvisp-visual-features-dev (= ${binary:Version}),
- libvisp-vision3.0 (= ${binary:Version})
+ libvisp-vision3.1 (= ${binary:Version})
Description: development files for libvisp-vision
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) computer vision
@@ -797,13 +861,13 @@ Description: development files for libvisp-vision
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-vision3.0
+Package: libvisp-vision3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-io3.0 (= ${binary:Version}),
- libvisp-visual-features3.0 (= ${binary:Version})
+ libvisp-io3.1 (= ${binary:Version}),
+ libvisp-visual-features3.1 (= ${binary:Version})
Description: visual servoing platform vision library
This package contains the ViSP (Visual Servoing Platform) computer vision
runtime library.
@@ -819,11 +883,11 @@ Description: visual servoing platform vision library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-vision3.0-dbg
+Package: libvisp-vision3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-vision3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-vision3.0
+Depends: ${misc:Depends}, libvisp-vision3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-vision3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) vision library.
.
@@ -845,7 +909,7 @@ Multi-Arch: same
Depends: ${misc:Depends},
libvisp-visual-features-dev (= ${binary:Version}),
libvisp-robot-dev (= ${binary:Version}),
- libvisp-vs3.0 (= ${binary:Version})
+ libvisp-vs3.1 (= ${binary:Version})
Description: development files for libvisp-vs
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) visual serving
@@ -862,13 +926,13 @@ Description: development files for libvisp-vs
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-vs3.0
+Package: libvisp-vs3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-visual-features3.0 (= ${binary:Version}),
- libvisp-robot3.0 (= ${binary:Version})
+ libvisp-visual-features3.1 (= ${binary:Version}),
+ libvisp-robot3.1 (= ${binary:Version})
Description: visual servoing platform vs library
This package contains the ViSP (Visual Servoing Platform) visual serving
(vs) runtime library.
@@ -884,11 +948,11 @@ Description: visual servoing platform vs library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-vs3.0-dbg
+Package: libvisp-vs3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-vs3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-vs3.0
+Depends: ${misc:Depends}, libvisp-vs3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-vs3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) visual servoing library.
.
@@ -913,7 +977,7 @@ Depends: ${misc:Depends},
libvisp-klt-dev (= ${binary:Version}),
libvisp-ar-dev (= ${binary:Version}),
libvisp-gui-dev (= ${binary:Version}),
- libvisp-mbt3.0 (= ${binary:Version})
+ libvisp-mbt3.1 (= ${binary:Version})
Description: development files for libvisp-mbt
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) markerless
@@ -930,16 +994,16 @@ Description: development files for libvisp-mbt
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-mbt3.0
+Package: libvisp-mbt3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-vision3.0 (= ${binary:Version}),
- libvisp-me3.0 (= ${binary:Version}),
- libvisp-klt3.0 (= ${binary:Version}),
- libvisp-ar3.0 (= ${binary:Version}),
- libvisp-gui3.0 (= ${binary:Version})
+ libvisp-vision3.1 (= ${binary:Version}),
+ libvisp-me3.1 (= ${binary:Version}),
+ libvisp-klt3.1 (= ${binary:Version}),
+ libvisp-ar3.1 (= ${binary:Version}),
+ libvisp-gui3.1 (= ${binary:Version})
Description: visual servoing platform mbt library
This package contains the ViSP (Visual Servoing Platform) markerless
3D model-based tracker (mbt) runtime library.
@@ -955,11 +1019,11 @@ Description: visual servoing platform mbt library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-mbt3.0-dbg
+Package: libvisp-mbt3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-mbt3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-mbt3.0
+Depends: ${misc:Depends}, libvisp-mbt3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-mbt3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) markerless 3D model-based tracker library.
.
@@ -980,7 +1044,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-vision-dev (= ${binary:Version}),
- libvisp-tt3.0 (= ${binary:Version})
+ libvisp-tt3.1 (= ${binary:Version})
Description: development files for libvisp-tt
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) template tracker
@@ -997,12 +1061,12 @@ Description: development files for libvisp-tt
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-tt3.0
+Package: libvisp-tt3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-vision3.0 (= ${binary:Version})
+ libvisp-vision3.1 (= ${binary:Version})
Description: visual servoing platform tt library
This package contains the ViSP (Visual Servoing Platform) template tracker
(tt) runtime library.
@@ -1018,11 +1082,11 @@ Description: visual servoing platform tt library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-tt3.0-dbg
+Package: libvisp-tt3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-tt3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-tt3.0
+Depends: ${misc:Depends}, libvisp-tt3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-tt3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) template tracker library.
.
@@ -1043,7 +1107,7 @@ Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
libvisp-tt-dev (= ${binary:Version}),
- libvisp-tt-mi3.0 (= ${binary:Version})
+ libvisp-tt-mi3.1 (= ${binary:Version})
Description: development files for libvisp-tt-mi
This package contains the header files and static library needed to compile
applications that use ViSP (Visual Servoing Platform) template tracker
@@ -1060,12 +1124,12 @@ Description: development files for libvisp-tt-mi
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-tt-mi3.0
+Package: libvisp-tt-mi3.1
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
- libvisp-tt3.0 (= ${binary:Version})
+ libvisp-tt3.1 (= ${binary:Version})
Description: visual servoing platform tt-mi library
This package contains the ViSP (Visual Servoing Platform) template tracker
based on mutual information (tt) runtime library.
@@ -1081,11 +1145,11 @@ Description: visual servoing platform tt-mi library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-tt-mi3.0-dbg
+Package: libvisp-tt-mi3.1-dbg
Section: debug
Architecture: any
-Depends: ${misc:Depends}, libvisp-tt-mi3.0 (= ${binary:Version})
-Description: Debugging symbol for libvisp-tt-mi3.0
+Depends: ${misc:Depends}, libvisp-tt-mi3.1 (= ${binary:Version})
+Description: Debugging symbol for libvisp-tt-mi3.1
This package contains detached debugging symbol for ViSP
(Visual Servoing Platform) template tracker based on mutual
information library.
diff --git a/debian/copyright b/debian/copyright
index a31339fd..8a919dc3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,30 +19,75 @@ Files: modules/io/src/tools/vpParseArgv.cpp
Copyright: 1990 Regents of the University of California
License: Tcl/Tk-license
-Files: debian/*
-Copyright: 2015, Fabien Spindler <Fabien.Spindler@inria.fr>
+Files: example/servo-franka/*
+Copyright: 2017 Franka Emika GmbH
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License version 2.0 can be found
+ in the file '/usr/share/common-licenses/Apache-2.0'.
+
+Files: 3rdparty/apriltag/*
+Copyright: 2013-2016, The Regents of The University of Michigan.
+License: BSD-2-clause
+
+Files: 3rdparty/atidaq/*
+Copyright: 1998, 1999 Thai Open Source Software Center Ltd
+License: MIT-license
+
+Files: 3rdparty/clapack/*
+Copyright: 1992-2008 The University of Tennessee.
+License: BSD-3-clause
+
+Files: 3rdparty/clipper/*
+Copyright: Angus Johnson 2010-2017
+License: Boost-software-license
+
+Files: 3rdparty/pthreads-win32/*
+Copyright: 2001,2006 Ross P. Johnson
License: GPL-2
+Files: debian/*
+Copyright: 2015-2017, Fabien Spindler <Fabien.Spindler@inria.fr>
+License: GPL-2
License: GPL-2
See `/usr/share/common-licenses/GPL-2'.
-License: BSD-3-clause
+License: BSD-2-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.
+ 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.
.
- * 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.
+ 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
+ OWNER 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
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
.
- * The names of Kitware, Inc., the Insight Consortium, or the names of
- any consortium members, or of any contributors, may not be used to
- endorse or promote products derived from this software without
- specific prior written permission.
+ 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 holders 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 HOLDER AND CONTRIBUTORS ``AS IS''
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -64,3 +109,47 @@ License: Tcl/Tk-license
makes no representations about the suitability of this
software for any purpose. It is provided "as is" without
express or implied warranty.
+
+License: Boost-software-license
+ 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: MIT-license
+ 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.
+
+
diff --git a/debian/libvisp-ar3.1.install b/debian/libvisp-ar3.1.install
new file mode 100644
index 00000000..a8dbc0c0
--- /dev/null
+++ b/debian/libvisp-ar3.1.install
@@ -0,0 +1,3 @@
+# libraries
+usr/lib/*/libvisp_ar.so.*
+
diff --git a/debian/libvisp-blob3.1.install b/debian/libvisp-blob3.1.install
new file mode 100644
index 00000000..27f1e255
--- /dev/null
+++ b/debian/libvisp-blob3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_blob.so.*
diff --git a/debian/libvisp-core3.1.install b/debian/libvisp-core3.1.install
new file mode 100644
index 00000000..d905125c
--- /dev/null
+++ b/debian/libvisp-core3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_core.so.*
diff --git a/debian/libvisp-detection3.1.install b/debian/libvisp-detection3.1.install
new file mode 100644
index 00000000..451d23f7
--- /dev/null
+++ b/debian/libvisp-detection3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_detection.so.*
diff --git a/debian/libvisp-doc.lintian-overrides b/debian/libvisp-doc.lintian-overrides
index 9f1adba3..9137fe15 100644
--- a/debian/libvisp-doc.lintian-overrides
+++ b/debian/libvisp-doc.lintian-overrides
@@ -1 +1,2 @@
embedded-javascript-library usr/share/doc/libvisp-doc/html/jquery.js please use libjs-jquery
+privacy-breach-generic usr/share/doc/libvisp-doc/html/*
diff --git a/debian/libvisp-gui3.1.install b/debian/libvisp-gui3.1.install
new file mode 100644
index 00000000..649dd9a4
--- /dev/null
+++ b/debian/libvisp-gui3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_gui.so.*
diff --git a/debian/libvisp-imgproc-dev.install b/debian/libvisp-imgproc-dev.install
new file mode 100644
index 00000000..27b1e5a2
--- /dev/null
+++ b/debian/libvisp-imgproc-dev.install
@@ -0,0 +1,5 @@
+# header files
+usr/include/*/visp3/imgproc/*
+usr/include/*/visp3/visp_imgproc.h
+# libraries
+usr/lib/*/libvisp_imgproc.so
diff --git a/debian/libvisp-imgproc3.1.install b/debian/libvisp-imgproc3.1.install
new file mode 100644
index 00000000..96fe538a
--- /dev/null
+++ b/debian/libvisp-imgproc3.1.install
@@ -0,0 +1,3 @@
+# libraries
+usr/lib/*/libvisp_imgproc.so.*
+
diff --git a/debian/libvisp-io3.1.install b/debian/libvisp-io3.1.install
new file mode 100644
index 00000000..49a0f8ae
--- /dev/null
+++ b/debian/libvisp-io3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_io.so.*
diff --git a/debian/libvisp-klt3.1.install b/debian/libvisp-klt3.1.install
new file mode 100644
index 00000000..32c3c22f
--- /dev/null
+++ b/debian/libvisp-klt3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_klt.so.*
diff --git a/debian/libvisp-mbt3.1.install b/debian/libvisp-mbt3.1.install
new file mode 100644
index 00000000..99b34ea9
--- /dev/null
+++ b/debian/libvisp-mbt3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_mbt.so.*
diff --git a/debian/libvisp-me3.1.install b/debian/libvisp-me3.1.install
new file mode 100644
index 00000000..fdfa65cb
--- /dev/null
+++ b/debian/libvisp-me3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_me.so.*
diff --git a/debian/libvisp-robot3.1.install b/debian/libvisp-robot3.1.install
new file mode 100644
index 00000000..96a4bd47
--- /dev/null
+++ b/debian/libvisp-robot3.1.install
@@ -0,0 +1,3 @@
+# libraries
+usr/lib/*/libvisp_robot.so.*
+
diff --git a/debian/libvisp-sensor3.1.install b/debian/libvisp-sensor3.1.install
new file mode 100644
index 00000000..0ced9545
--- /dev/null
+++ b/debian/libvisp-sensor3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_sensor.so.*
diff --git a/debian/libvisp-tt-mi3.1.install b/debian/libvisp-tt-mi3.1.install
new file mode 100644
index 00000000..3837a5cf
--- /dev/null
+++ b/debian/libvisp-tt-mi3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_tt_mi.so.*
diff --git a/debian/libvisp-tt3.1.install b/debian/libvisp-tt3.1.install
new file mode 100644
index 00000000..ea4cdba0
--- /dev/null
+++ b/debian/libvisp-tt3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_tt.so.*
diff --git a/debian/libvisp-vision3.1.install b/debian/libvisp-vision3.1.install
new file mode 100644
index 00000000..25b233bc
--- /dev/null
+++ b/debian/libvisp-vision3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_vision.so.*
diff --git a/debian/libvisp-visual-features3.1.install b/debian/libvisp-visual-features3.1.install
new file mode 100644
index 00000000..ed0bfd25
--- /dev/null
+++ b/debian/libvisp-visual-features3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_visual_features.so.*
diff --git a/debian/libvisp-vs3.1.install b/debian/libvisp-vs3.1.install
new file mode 100644
index 00000000..9b996927
--- /dev/null
+++ b/debian/libvisp-vs3.1.install
@@ -0,0 +1 @@
+usr/lib/*/libvisp_vs.so.*
diff --git a/debian/patches/0001-Turn-rpath-off-for-install.patch b/debian/patches/0001-Turn-rpath-off-for-install.patch
index 5d3cfb2c..88063510 100644
--- a/debian/patches/0001-Turn-rpath-off-for-install.patch
+++ b/debian/patches/0001-Turn-rpath-off-for-install.patch
@@ -1,6 +1,6 @@
-From e35e22058557193b09bc45a585ce9cedd0326fed Mon Sep 17 00:00:00 2001
+From b8e5fbea58f20f7e26dd8e6199c34f9962e64f5f Mon Sep 17 00:00:00 2001
From: Fabien Spindler <Fabien.Spindler@inria.fr>
-Date: Wed, 8 Feb 2017 09:44:09 +0100
+Date: Tue, 26 Dec 2017 10:51:48 +0100
Subject: [PATCH] Turn rpath off for install
---
@@ -8,10 +8,10 @@ Subject: [PATCH] Turn rpath off for install
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 694e188..56a0c61 100644
+index d952c18..00a1200 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -198,17 +198,11 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
+@@ -208,17 +208,11 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
# (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
@@ -32,5 +32,5 @@ index 694e188..56a0c61 100644
# ----------------------------------------------------------------------------
# Path for additional contrib modules
--
-2.11.0
+2.15.1
diff --git a/debian/rules b/debian/rules
index 47ce2122..77dde254 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,6 @@ else
CMAKE_ARCH_FLAGS = -DUSE_DC1394=OFF -DUSE_V4L2=OFF -DUSE_OIS=OFF
endif
-# freenect is not available on hurd.
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
- CMAKE_ARCH_FLAGS += -DUSE_LIBFREENECT=OFF
-else
- CMAKE_ARCH_FLAGS += -DUSE_LIBFREENECT=ON
-endif
-
# CMake flags
CMAKE_FLAGS = \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -34,24 +27,6 @@ CMAKE_FLAGS = \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
-DCMAKE_EXE_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
-DCMAKE_BUILD_TYPE=Release \
- -DBUILD_DEMOS=ON \
- -DBUILD_TESTS=ON \
- -DBUILD_EXAMPLES=ON \
- -DBUILD_TUTORIALS=ON \
- -DBUILD_SHARED_LIBS=ON \
- -DUSE_FFMPEG=OFF \
- -DUSE_OPENCV=ON \
- -DUSE_COIN3D=ON \
- -DUSE_LAPACK=ON \
- -DUSE_GSL=ON \
- -DUSE_XML2=ON \
- -DUSE_GTK2=OFF \
- -DUSE_JPEG=ON \
- -DUSE_PNG=ON \
- -DUSE_X11=ON \
- -DUSE_ZBAR=ON \
- -DUSE_DMTX=ON \
- -DUSE_OGRE=ON \
$(CMAKE_ARCH_FLAGS)
%:
@@ -70,22 +45,23 @@ override_dh_installdocs:
dh_installdocs -X.md5
override_dh_strip:
- dh_strip -plibvisp-core3.0 --dbg-package=libvisp-core3.0-dbg
- dh_strip -plibvisp-gui3.0 --dbg-package=libvisp-gui3.0-dbg
- dh_strip -plibvisp-io3.0 --dbg-package=libvisp-io3.0-dbg
- dh_strip -plibvisp-detection3.0 --dbg-package=libvisp-detection3.0-dbg
- dh_strip -plibvisp-ar3.0 --dbg-package=libvisp-ar3.0-dbg
- dh_strip -plibvisp-blob3.0 --dbg-package=libvisp-blob3.0-dbg
- dh_strip -plibvisp-me3.0 --dbg-package=libvisp-me3.0-dbg
- dh_strip -plibvisp-klt3.0 --dbg-package=libvisp-klt3.0-dbg
- dh_strip -plibvisp-sensor3.0 --dbg-package=libvisp-sensor3.0-dbg
- dh_strip -plibvisp-robot3.0 --dbg-package=libvisp-robot3.0-dbg
- dh_strip -plibvisp-visual-features3.0 --dbg-package=libvisp-visual-features3.0-dbg
- dh_strip -plibvisp-vision3.0 --dbg-package=libvisp-vision3.0-dbg
- dh_strip -plibvisp-vs3.0 --dbg-package=libvisp-vs3.0-dbg
- dh_strip -plibvisp-mbt3.0 --dbg-package=libvisp-mbt3.0-dbg
- dh_strip -plibvisp-tt3.0 --dbg-package=libvisp-tt3.0-dbg
- dh_strip -plibvisp-tt-mi3.0 --dbg-package=libvisp-tt-mi3.0-dbg
+ dh_strip -plibvisp-ar3.1 --dbg-package=libvisp-ar3.1-dbg
+ dh_strip -plibvisp-blob3.1 --dbg-package=libvisp-blob3.1-dbg
+ dh_strip -plibvisp-core3.1 --dbg-package=libvisp-core3.1-dbg
+ dh_strip -plibvisp-detection3.1 --dbg-package=libvisp-detection3.1-dbg
+ dh_strip -plibvisp-gui3.1 --dbg-package=libvisp-gui3.1-dbg
+ dh_strip -plibvisp-imgproc3.1 --dbg-package=libvisp-imgproc3.1-dbg
+ dh_strip -plibvisp-io3.1 --dbg-package=libvisp-io3.1-dbg
+ dh_strip -plibvisp-klt3.1 --dbg-package=libvisp-klt3.1-dbg
+ dh_strip -plibvisp-mbt3.1 --dbg-package=libvisp-mbt3.1-dbg
+ dh_strip -plibvisp-me3.1 --dbg-package=libvisp-me3.1-dbg
+ dh_strip -plibvisp-robot3.1 --dbg-package=libvisp-robot3.1-dbg
+ dh_strip -plibvisp-sensor3.1 --dbg-package=libvisp-sensor3.1-dbg
+ dh_strip -plibvisp-visual-features3.1 --dbg-package=libvisp-visual-features3.1-dbg
+ dh_strip -plibvisp-vision3.1 --dbg-package=libvisp-vision3.1-dbg
+ dh_strip -plibvisp-vs3.1 --dbg-package=libvisp-vs3.1-dbg
+ dh_strip -plibvisp-tt3.1 --dbg-package=libvisp-tt3.1-dbg
+ dh_strip -plibvisp-tt-mi3.1 --dbg-package=libvisp-tt-mi3.1-dbg
dh_strip
# Due to numerical imprecision, some tests are failing on ia64.
@@ -104,14 +80,4 @@ override_dh_auto_test-arch:
export VISP_INPUT_IMAGE_PATH=/usr/share/visp-images-data/ \
&& dh_auto_test || ${DH_AUTOTEST_CAN_FAIL}
-# Since Ogre removal no more useful
-#override_dh_install:
-#ifneq ($(DEB_HOST_ARCH_OS),hurd)
-# ifneq ($(DEB_HOST_ARCH_OS),kfreebsd)
-# # On hurd and kfreebsd usr/lib/*/visp/* is empty and produces an error
-# dh_install "usr/lib/*/visp/*" -p libvisp-dev
-# # Continue with regular dh_install
-# dh_install
-# endif
-#endif
--
GitLab