Andreas Tille pushed to branch master at Debian Med / opencfu
Commits: e14c36d9 by Andreas Tille at 2020-01-24T15:30:06+01:00 routine-update: Standards-Version: 4.5.0 - - - - - ae34c2fc by Andreas Tille at 2020-01-24T15:30:06+01:00 routine-update: debhelper-compat 12 - - - - - 89b6a6d7 by Andreas Tille at 2020-01-24T15:30:14+01:00 routine-update: Secure URI in copyright format - - - - - bc8bce7e by Andreas Tille at 2020-01-24T15:30:14+01:00 Trim trailing whitespace. Fixes: lintian: file-contains-trailing-whitespace See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html - - - - - 6a001a79 by Andreas Tille at 2020-01-24T15:30:31+01:00 Set upstream metadata fields: Repository. - - - - - 8d56b94b by Andreas Tille at 2020-01-24T16:02:55+01:00 Debian moved to opencv4 which needs to be detected by pkg-config - - - - - 8 changed files: - debian/changelog - − debian/compat - debian/control - debian/copyright - + debian/patches/0017_opencv4.patch - debian/patches/series - debian/rules - debian/upstream/metadata Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +opencfu (3.9.0-4) UNRELEASED; urgency=medium + + * Standards-Version: 4.5.0 (routine-update) + * debhelper-compat 12 (routine-update) + * Secure URI in copyright format (routine-update) + * Trim trailing whitespace. + * Set upstream metadata fields: Repository. + + -- Andreas Tille <[email protected]> Fri, 24 Jan 2020 15:30:06 +0100 + opencfu (3.9.0-3) unstable; urgency=medium * debhelper 11 ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -4,10 +4,10 @@ Uploaders: Quentin Geissmann <[email protected]>, Andreas Tille <[email protected]> Section: misc Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), libgtkmm-2.4-dev, libopencv-dev -Standards-Version: 4.1.5 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/med-team/opencfu Vcs-Git: https://salsa.debian.org/med-team/opencfu.git Homepage: http://opencfu.sourceforge.net/ ===================================== debian/copyright ===================================== @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: OpenCFU Upstream-Contact: Quentin Geissmann <[email protected]> Source: http://sourceforge.net/projects/opencfu/files/linux/ ===================================== debian/patches/0017_opencv4.patch ===================================== @@ -0,0 +1,15 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Fri, 24 Jan 2020 15:30:06 +0100 +Description: Debian moved to opencv4 which needs to be detected by pkg-config + +--- a/configure.ac ++++ b/configure.ac +@@ -27,7 +27,7 @@ AC_OPENMP + AC_SUBST(OPENMP_CFLAGS) + + # We check for opencv 2.4. if absent, stop!! +-PKG_CHECK_MODULES([OPENCV],[opencv >= 2.4.2],[],[AC_MSG_ERROR(OpenCV not found. Have you installed the library (devel version)). OpenCFU cannot be built without OpenCV!]) ++PKG_CHECK_MODULES([OPENCV],[opencv4 >= 2.4.2],[],[AC_MSG_ERROR(OpenCV not found. Have you installed the library (devel version)). OpenCFU cannot be built without OpenCV!]) + + ### We add opencv to global AM flags. + ===================================== debian/patches/series ===================================== @@ -14,3 +14,4 @@ 0014-Update-Colour-difference-formula.patch 0015-Checked-that-patch-compiles-and-updated-versioning.patch 0016-Compiler-compatibility-fix.patch +0017_opencv4.patch ===================================== debian/rules ===================================== @@ -4,4 +4,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ - ===================================== debian/upstream/metadata ===================================== @@ -21,3 +21,4 @@ Registry: Entry: NA - Name: bio.tools Entry: NA +Repository: https://git.code.sf.net/p/opencfu/code/ View it on GitLab: https://salsa.debian.org/med-team/opencfu/compare/7b6c4c2dbbd1b9a3499763993d909307ee348322...8d56b94b458ae9eef013e52ae911084368010ba5 -- View it on GitLab: https://salsa.debian.org/med-team/opencfu/compare/7b6c4c2dbbd1b9a3499763993d909307ee348322...8d56b94b458ae9eef013e52ae911084368010ba5 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
