[visp] 02/02: new upstream release 3.0.1

Olivier Sallou osallou at debian.org
Mon Feb 13 08:53:02 UTC 2017 

This is an automated email from the git hooks/post-receive script.

osallou pushed a commit to branch master
in repository visp.

commit 4195cd189db80c84c53699549277074fe7636375
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Mon Feb 13 09:33:17 2017 +0100

    new upstream release 3.0.1
---
 debian/changelog                                   | 16 ++++++++++
 debian/control                                     | 17 +++++-----
 debian/copyright                                   |  4 +--
 debian/libvisp-ar-dev.install                      |  1 +
 debian/libvisp-blob-dev.install                    |  1 +
 debian/libvisp-core-dev.install                    |  2 +-
 debian/libvisp-detection-dev.install               |  1 +
 debian/libvisp-dev.install                         |  3 ++
 debian/libvisp-gui-dev.install                     |  1 +
 debian/libvisp-io-dev.install                      |  1 +
 debian/libvisp-klt-dev.install                     |  1 +
 debian/libvisp-mbt-dev.install                     |  1 +
 debian/libvisp-me-dev.install                      |  1 +
 debian/libvisp-robot-dev.install                   |  1 +
 debian/libvisp-sensor-dev.install                  |  1 +
 debian/libvisp-tt-dev.install                      |  1 +
 debian/libvisp-tt-mi-dev.install                   |  1 +
 debian/libvisp-vision-dev.install                  |  1 +
 debian/libvisp-visual-features-dev.install         |  1 +
 debian/libvisp-vs-dev.install                      |  1 +
 .../patches/0001-Turn-rpath-off-for-install.patch  | 36 ++++++++++++++++++++++
 debian/patches/series                              |  7 +----
 debian/rules                                       |  7 ++---
 debian/visp-config.1                               |  2 +-
 debian/watch                                       |  2 +-
 25 files changed, 87 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ce4426..a3f9c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+visp (3.0.1-1) unstable; urgency=medium
+
+  * Update watch file
+  * Remove 3.0.0 patches
+  * New upstream version 3.0.1
+  * Update debian material for visp 3.0.1
+    - fix lintian warnings ancient-standards-version,
+      spelling-error-in-description (duplicate word) vision
+    - install module meta header include
+    - old visp headers are installed with libvisp-dev to ensure usage when
+      all modules are installed
+    - install includes in arch triplet
+  * Add patches for visp 3.0.1
+
+ -- Fabien Spindler <Fabien.Spindler at inria.fr>  Wed, 08 Feb 2017 09:46:36 +0100
+
 visp (3.0.0-4) unstable; urgency=medium
 
   * Remove libusb-1.0-0-dev explicit dependency that will come from
diff --git a/debian/control b/debian/control
index b91b0f0..055d516 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
 	libcoin80-dev,
 	libsoqt4-dev,
 	libdc1394-22-dev [linux-any],
-	libv4l-dev [linux-any],
+	libv4l-dev [!hurd-any],
 	libfreenect-dev [!hurd-any !kfreebsd-any],
 	libxml2-dev,
 	libjpeg-dev,
@@ -20,11 +20,12 @@ Build-Depends: debhelper (>= 9),
 	libx11-dev,
 	libzbar-dev,
 	libdmtx-dev,
+	libogre-1.9-dev,
 	visp-images-data
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/visp.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/visp.git
-Homepage: http://visp.inria.fr
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/debian-science/packages/visp.git
+Vcs-Git: https://anonscm.debian.org/debian-science/packages/visp.git
+Homepage: https://visp.inria.fr
 
 Package: libvisp-dev
 Section: libdevel
@@ -72,8 +73,6 @@ Depends: ${misc:Depends},
 	liblapack-dev,
 	libgsl-dev,
 	libxml2-dev
-Replaces: libvisp-dev (<< 3.0.0-1)
-Breaks: libvisp-dev (<< 3.0.0-1)
 Description: development files for libvisp-core
  This package contains the header files and static library needed to compile
  applications that use ViSP (Visual Servoing Platform) core.
@@ -785,7 +784,7 @@ Depends: ${misc:Depends},
 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
- (vision) library.
+ library.
  .
  ViSP standing for Visual Servoing Platform is a modular cross
  platform library that allows prototyping and developing applications
@@ -807,7 +806,7 @@ Depends: ${misc:Depends},
 	libvisp-visual-features3.0 (= ${binary:Version})
 Description: visual servoing platform vision library
  This package contains the ViSP (Visual Servoing Platform) computer vision
- (vision) runtime library.
+ runtime library.
  .
  ViSP standing for Visual Servoing Platform is a modular cross
  platform library that allows prototyping and developing applications
diff --git a/debian/copyright b/debian/copyright
index 16b9e9f..a31339f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ViSP
 Upstream-Contact: visp at inria.fr
-Source: http://visp.inria.fr/download
+Source: https://visp.inria.fr/download
 
 Files: *
-Copyright: 2005-2015, Inria
+Copyright: 2005-2017, Inria
 License: GPL-2
 
 Files: cmake/GNUInstallDirs.cmake
diff --git a/debian/libvisp-ar-dev.install b/debian/libvisp-ar-dev.install
index e4446c3..29c5aee 100644
--- a/debian/libvisp-ar-dev.install
+++ b/debian/libvisp-ar-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/ar/*
+usr/include/*/visp3/visp_ar.h
 # libraries
 usr/lib/*/libvisp_ar.so
diff --git a/debian/libvisp-blob-dev.install b/debian/libvisp-blob-dev.install
index 9df193c..3b70a72 100644
--- a/debian/libvisp-blob-dev.install
+++ b/debian/libvisp-blob-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/blob/*
+usr/include/*/visp3/visp_blob.h
 # libraries
 usr/lib/*/libvisp_blob.so
diff --git a/debian/libvisp-core-dev.install b/debian/libvisp-core-dev.install
index 187c252..9b0c2aa 100644
--- a/debian/libvisp-core-dev.install
+++ b/debian/libvisp-core-dev.install
@@ -1,6 +1,6 @@
 # header files
 usr/include/*/visp3/core/*
+usr/include/*/visp3/visp_core.h
 usr/include/*/visp3/visp_modules.h
-usr/include/*/visp/*
 # libraries
 usr/lib/*/libvisp_core.so
diff --git a/debian/libvisp-detection-dev.install b/debian/libvisp-detection-dev.install
index 964b3a8..9f7f432 100644
--- a/debian/libvisp-detection-dev.install
+++ b/debian/libvisp-detection-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/detection/*
+usr/include/*/visp3/visp_detection.h
 # libraries
 usr/lib/*/libvisp_detection.so
diff --git a/debian/libvisp-dev.install b/debian/libvisp-dev.install
index d8d4d09..e9fa094 100644
--- a/debian/libvisp-dev.install
+++ b/debian/libvisp-dev.install
@@ -1,3 +1,6 @@
+# header files
+usr/include/*/visp3/visp.h
+usr/include/*/visp/*
 # visp detection helpers
 usr/bin/visp-config
 usr/lib/*/cmake/*
diff --git a/debian/libvisp-gui-dev.install b/debian/libvisp-gui-dev.install
index d09036a..be4259a 100644
--- a/debian/libvisp-gui-dev.install
+++ b/debian/libvisp-gui-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/gui/*
+usr/include/*/visp3/visp_gui.h
 # libraries
 usr/lib/*/libvisp_gui.so
diff --git a/debian/libvisp-io-dev.install b/debian/libvisp-io-dev.install
index 0c3846d..581eb55 100644
--- a/debian/libvisp-io-dev.install
+++ b/debian/libvisp-io-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/io/*
+usr/include/*/visp3/visp_io.h
 # libraries
 usr/lib/*/libvisp_io.so
diff --git a/debian/libvisp-klt-dev.install b/debian/libvisp-klt-dev.install
index 2944b35..b9f68ff 100644
--- a/debian/libvisp-klt-dev.install
+++ b/debian/libvisp-klt-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/klt/*
+usr/include/*/visp3/visp_klt.h
 # libraries
 usr/lib/*/libvisp_klt.so
diff --git a/debian/libvisp-mbt-dev.install b/debian/libvisp-mbt-dev.install
index fb64994..66a187c 100644
--- a/debian/libvisp-mbt-dev.install
+++ b/debian/libvisp-mbt-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/mbt/*
+usr/include/*/visp3/visp_mbt.h
 # libraries
 usr/lib/*/libvisp_mbt.so
diff --git a/debian/libvisp-me-dev.install b/debian/libvisp-me-dev.install
index 24bda87..4281838 100644
--- a/debian/libvisp-me-dev.install
+++ b/debian/libvisp-me-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/me/*
+usr/include/*/visp3/visp_me.h
 # libraries
 usr/lib/*/libvisp_me.so
diff --git a/debian/libvisp-robot-dev.install b/debian/libvisp-robot-dev.install
index 3117f55..14f3a5a 100644
--- a/debian/libvisp-robot-dev.install
+++ b/debian/libvisp-robot-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/robot/*
+usr/include/*/visp3/visp_robot.h
 # libraries
 usr/lib/*/libvisp_robot.so
diff --git a/debian/libvisp-sensor-dev.install b/debian/libvisp-sensor-dev.install
index 46b513c..03afe2d 100644
--- a/debian/libvisp-sensor-dev.install
+++ b/debian/libvisp-sensor-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/sensor/*
+usr/include/*/visp3/visp_sensor.h
 # libraries
 usr/lib/*/libvisp_sensor.so
diff --git a/debian/libvisp-tt-dev.install b/debian/libvisp-tt-dev.install
index 18cfdc0..e963a54 100644
--- a/debian/libvisp-tt-dev.install
+++ b/debian/libvisp-tt-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/tt/*
+usr/include/*/visp3/visp_tt.h
 # libraries
 usr/lib/*/libvisp_tt.so
diff --git a/debian/libvisp-tt-mi-dev.install b/debian/libvisp-tt-mi-dev.install
index 40f1c60..6dc66aa 100644
--- a/debian/libvisp-tt-mi-dev.install
+++ b/debian/libvisp-tt-mi-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/tt_mi/*
+usr/include/*/visp3/visp_tt_mi.h
 # libraries
 usr/lib/*/libvisp_tt_mi.so
diff --git a/debian/libvisp-vision-dev.install b/debian/libvisp-vision-dev.install
index a1b33f4..c5acb7b 100644
--- a/debian/libvisp-vision-dev.install
+++ b/debian/libvisp-vision-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/vision/*
+usr/include/*/visp3/visp_vision.h
 # libraries
 usr/lib/*/libvisp_vision.so
diff --git a/debian/libvisp-visual-features-dev.install b/debian/libvisp-visual-features-dev.install
index 2d84a4c..8806578 100644
--- a/debian/libvisp-visual-features-dev.install
+++ b/debian/libvisp-visual-features-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/visual_features/*
+usr/include/*/visp3/visp_visual_features.h
 # libraries
 usr/lib/*/libvisp_visual_features.so
diff --git a/debian/libvisp-vs-dev.install b/debian/libvisp-vs-dev.install
index 1515bf2..d42cab1 100644
--- a/debian/libvisp-vs-dev.install
+++ b/debian/libvisp-vs-dev.install
@@ -1,4 +1,5 @@
 # header files
 usr/include/*/visp3/vs/*
+usr/include/*/visp3/visp_vs.h
 # libraries
 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
new file mode 100644
index 0000000..5d3cfb2
--- /dev/null
+++ b/debian/patches/0001-Turn-rpath-off-for-install.patch
@@ -0,0 +1,36 @@
+From e35e22058557193b09bc45a585ce9cedd0326fed Mon Sep 17 00:00:00 2001
+From: Fabien Spindler <Fabien.Spindler at inria.fr>
+Date: Wed, 8 Feb 2017 09:44:09 +0100
+Subject: [PATCH] Turn rpath off for install
+
+---
+ CMakeLists.txt | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 694e188..56a0c61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -198,17 +198,11 @@ set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+ # (but later on when installing)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ 
+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VISP_LIB_INSTALL_PATH}")
++set(CMAKE_INSTALL_RPATH "")
+ 
+ # add the automatically determined parts of the RPATH
+ # which point to directories outside the build tree to the install RPATH
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-
+-# the RPATH to be used when installing, but only if it's not a system directory
+-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${VISP_LIB_INSTALL_PATH}" isSystemDir)
+-if("${isSystemDir}" STREQUAL "-1")
+-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VISP_LIB_INSTALL_PATH}")
+-endif("${isSystemDir}" STREQUAL "-1")
++set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+ 
+ # ----------------------------------------------------------------------------
+ #  Path for additional contrib modules
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index d51f829..86e9a1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-0001-Install-headers-in-include-architecture-triplet.patch
-0002-Turn-rpath-off-for-install.patch
-0003-Fix-to-consider-char-implemented-as-signed-and-unsig.patch
-0004-Remove-PyramidBRISK-and-PyramidORB-from-test-kind-of.patch
-0005-Fix-issue-in-vpKeypoint-database-I-O-on-big-endian-a.patch
-0006-Remove-videoReader-test.patch
+0001-Turn-rpath-off-for-install.patch
diff --git a/debian/rules b/debian/rules
index 58f95c5..47ce212 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ endif
 # CMake flags
 CMAKE_FLAGS = \
 	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_INSTALL_INCLUDEDIR="include/$(DEB_HOST_MULTIARCH)" \
 	-DCMAKE_INSTALL_LIBDIR="lib/$(DEB_HOST_MULTIARCH)" \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
 	-DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
@@ -50,6 +51,7 @@ CMAKE_FLAGS = \
 	-DUSE_X11=ON \
 	-DUSE_ZBAR=ON \
 	-DUSE_DMTX=ON \
+	-DUSE_OGRE=ON \
 	$(CMAKE_ARCH_FLAGS)
 
 %:
@@ -86,9 +88,6 @@ override_dh_strip:
 	dh_strip -plibvisp-tt-mi3.0 --dbg-package=libvisp-tt-mi3.0-dbg
 	dh_strip
 
-# Parallelism is disabled in tests as some cannot run at the same
-# time
-#
 # Due to numerical imprecision, some tests are failing on ia64.
 # This is not a critical issue so we let the testing fail on this
 # architecture for now.
@@ -103,7 +102,7 @@ override_dh_auto_test-indep:
 
 override_dh_auto_test-arch:
 	export VISP_INPUT_IMAGE_PATH=/usr/share/visp-images-data/ \
-	 && dh_auto_test --max-parallel=1 || ${DH_AUTOTEST_CAN_FAIL}
+	 && dh_auto_test || ${DH_AUTOTEST_CAN_FAIL}
 
 # Since Ogre removal no more useful
 #override_dh_install:
diff --git a/debian/visp-config.1 b/debian/visp-config.1
index 0350bec..dc71d41 100644
--- a/debian/visp-config.1
+++ b/debian/visp-config.1
@@ -39,7 +39,7 @@ Show help message and exit.
 
 .TP
 .B Home Page
-http://visp.inria.fr
+https://visp.inria.fr
 
 The primary starting point for learning about ViSP library.
 
diff --git a/debian/watch b/debian/watch
index 66bf13d..8933b1d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,4 @@ version=3
 opts=dversionmangle=s/\+dfsg//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 pgpsigurlmangle=s/$/.asc/ \
 http://visp.inria.fr/download \
-(?:.*/|)visp-(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz|zip)(?:|\?\S+)
+(?:.*/|)visp-(\d\S*).(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz|zip)\b(?<!framework.zip)(?:|\?\S+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visp.git

More information about the debian-science-commits mailing list