From caadd120d9a9c5021c82ec0616b06e7c922e083c Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Tue, 8 Jan 2013 15:43:34 +0900
Subject: [PATCH] Take into account Nobuhiro Iwamatsu feedback.
* Revert name change libvisp -> libvisp2 but keep development package
name as libvisp-dev.
* Add missing space in dependencies.
* Remove unrequired dependency toward libopencv-highgui-dev.
---
debian/control | 13 ++++++-------
debian/libvisp.lintian-overrides | 2 --
debian/{libvisp.install => libvisp2.install} | 0
debian/{libvisp.manpages => libvisp2.manpages} | 0
debian/rules | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
delete mode 100644 debian/libvisp.lintian-overrides
rename debian/{libvisp.install => libvisp2.install} (100%)
rename debian/{libvisp.manpages => libvisp2.manpages} (100%)
diff --git a/debian/control b/debian/control
index a46a6808..96d2ec28 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Uploaders: Thomas Moulard <thomas.moulard@gmail.com>
Build-Depends: debhelper (>= 9), cmake (>= 2.6),
doxygen (>= 1.6.3), doxygen-latex,
libopencv-dev,
- libopencv-highgui-dev,
liblapack-dev (>= 3.2),
libcoin60-dev (>= 3.1.2),
libsoqt4-dev (>= 1.4.2~svn20090224),
@@ -21,7 +20,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6),
libavcodec-dev (>= 0.5.1),
libbz2-dev (>= 1.0.5),
libx11-dev (>= 1.3.2),
- libv4l-dev (>=0.6.4),
+ libv4l-dev (>= 0.6.4),
libusb-dev,
libfreenect-dev (>= 0.0.1),
libois-dev
@@ -35,7 +34,6 @@ Package: libvisp-dev
Section: libdevel
Architecture: any
Depends: libopencv-dev,
- libopencv-highgui-dev,
liblapack-dev (>= 3.2),
libcoin60-dev (>= 3.1.2),
libsoqt4-dev (>= 1.4.2~svn20090224),
@@ -50,10 +48,11 @@ Depends: libopencv-dev,
libavcodec-dev (>= 0.5.1),
libbz2-dev (>= 1.0.5),
libx11-dev (>= 1.3.2),
- libv4l-dev (>=0.6.4),
+ libv4l-dev (>= 0.6.4),
libusb-dev,
libfreenect-dev (>= 0.0.1),
libois-dev,
+ libvisp2 (= ${binary:Version}),
${misc:Depends}
Suggests: libvisp-doc
Description: visual servoing library - development files
@@ -67,7 +66,7 @@ Description: visual servoing library - development files
This package contains development files (headers and shared library
symbolic link).
-Package: libvisp
+Package: libvisp2
Architecture: any
Pre-depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -80,10 +79,10 @@ Description: visual servoing library
ViSP can be useful in robotics, computer vision, augmented reality and
computer animation.
-Package: libvisp-dbg
+Package: libvisp2-dbg
Architecture: any
Section: debug
-Depends: libvisp (= ${binary:Version}), ${misc:Depends}
+Depends: libvisp2 (= ${binary:Version}), ${misc:Depends}
Description: visual servoing library - debugging symbols
ViSP, standing for Visual Servoing Platform, is unique. This software
is a complete cross-platform solution that allows prototyping and
diff --git a/debian/libvisp.lintian-overrides b/debian/libvisp.lintian-overrides
deleted file mode 100644
index 7cf33606..00000000
--- a/debian/libvisp.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-no-symbols-control-file usr/lib/x86_64-linux-gnu/libvisp.so.2.6.2
-package-name-doesnt-match-sonames libvisp2
diff --git a/debian/libvisp.install b/debian/libvisp2.install
similarity index 100%
rename from debian/libvisp.install
rename to debian/libvisp2.install
diff --git a/debian/libvisp.manpages b/debian/libvisp2.manpages
similarity index 100%
rename from debian/libvisp.manpages
rename to debian/libvisp2.manpages
diff --git a/debian/rules b/debian/rules
index 10333ab7..3943a663 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,6 @@ override_dh_auto_build:
dh_auto_build -- html-doc # Generate Doxygen HTML documentation.
override_dh_strip:
- dh_strip -a --dbg-package=libvisp-dbg
+ dh_strip -a --dbg-package=libvisp2-dbg
override_dh_auto_test:
--
GitLab