Hi, Thanks for your work!
> Fixed. Next steps would be: > > adt-run --unbuilt-tree=limereg --- null > git tag -s -a debian/1.4.1-1 -m "Release 1.4.1-1" > git push --all > git push --tag > > But I have a: WARNING: 'automake-1.15' is missing on your system, so I > cannot verify before creating the tag. Will move my development PC to > SID, maybe there automake is more recent, would be cleaner anyway. The easiest way is to migrate the package to debhelper 10. Fix these problems by migrating. Please see 0002-10.patch. Also, version 1.4.1 fails to build with opencv 2.x. I have created a patch which support opencv 3.x and 2.x. Could you check this patch? Best regards, Nobuhiro -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6
From 5e5873c21a52d0374f79a62133a33f5d9d8f088c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu <iwama...@nigauri.org> Date: Tue, 8 Nov 2016 00:01:13 +0900 Subject: [PATCH 2/2] Support debhelper 10 Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 66413f7..38114c4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org> Uploaders: Roelof Berg <rb...@berg-solutions.de> -Build-Depends: debhelper (>= 9), libopencv-dev, libboost-dev, libboost-program-options-dev, doxygen, help2man +Build-Depends: debhelper (>= 10), libopencv-dev, libboost-dev, libboost-program-options-dev, doxygen, help2man Standards-Version: 3.9.6 Homepage: http://embedded-software-architecture.com/limereg.html Vcs-Git: git://anonscm.debian.org/debian-science/packages/limereg.git -- 2.10.1
From 08b8ba3b5af921b15f5f9abb994f10c4857acac1 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu <iwama...@nigauri.org> Date: Tue, 8 Nov 2016 00:59:12 +0900 Subject: [PATCH 1/2] Add support build OpenCV 3 Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- debian/patches/ocv3check | 46 ++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 47 insertions(+) create mode 100644 debian/patches/ocv3check create mode 100644 debian/patches/series diff --git a/debian/patches/ocv3check b/debian/patches/ocv3check new file mode 100644 index 0000000..65f9d44 --- /dev/null +++ b/debian/patches/ocv3check @@ -0,0 +1,46 @@ +diff --git a/configure.ac b/configure.ac +index 6877b7a..7f55f45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,6 +42,7 @@ else + fi + + HAVE_OPENCV=false ++HAVE_OPENCV3=false + PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, [HAVE_OPENCV=true], [true]) + if test x$HAVE_OPENCV = xfalse; then + AC_MSG_WARN([*** opencv >= 2.3.1 not found - Cannot build the command line tool, which relies on OpenCV. Only the library will be built, because the lib has no dependency to OpenCV. http://opencvlibrary.sourceforge.net ***]) +@@ -50,8 +51,16 @@ else + OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`" + #OPENCV_INCLUDE=pkg-config opencv --variable=includedir_old + AC_DEFINE([HAVE_OPENCV],[1],[Define to 1 if you have OpenCV >= 2.3.1]) ++ # OpenCV 3.x check ++ PKG_CHECK_MODULES(OPENCV3, opencv >= 3, [HAVE_OPENCV3=true], [true]) ++ if test x$HAVE_OPENCV3 = xfalse; then ++ AC_DEFINE([HAVE_OPENCV3],[0],[Define to 1 if you have OpenCV >= 3]) ++ else ++ AC_DEFINE([HAVE_OPENCV3],[1],[Define to 1 if you have OpenCV >= 3]) ++ fi + fi + AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue]) ++AM_CONDITIONAL([HAVE_OPENCV3], [test x$HAVE_OPENCV3 = xtrue]) + + #ToDo: Make Boost optional like OpenCV. (Boost_Require takes two arguments if found and if not ...) + HAVE_BOOST=false +diff --git a/exe/Makefile.am b/exe/Makefile.am +index 15fb25f..1bb8fc2 100644 +--- a/exe/Makefile.am ++++ b/exe/Makefile.am +@@ -22,7 +22,12 @@ limereg_CFLAGS += @OPENCV_CFLAGS@ + limereg_CPPFLAGS += @OPENCV_CFLAGS@ + #limereg_LDFLAGS += @OPENCV_LDFLAGS@ + #limereg_LDADD += @OPENCV_LIBS@ ++ ++if HAVE_OPENCV3 + limereg_LDADD += -lopencv_highgui -lopencv_core -lopencv_imgcodecs ++else ++limereg_LDADD += -lopencv_highgui -lopencv_core ++endif #HAVE_OPENCV3 + + #Manpages for the command-line utility + if HAVE_HELP2MAN diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..52f6da7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +ocv3check -- 2.10.1
-- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers