This is an automated email from the git hooks/post-receive script. gregsharp-guest pushed a commit to branch master in repository plastimatch.
commit d039e9db75dd5709c47785652f12fee83d5e5bfd Author: Gregory C. Sharp <gregsharp....@yahoo.com> Date: Mon Dec 5 15:43:39 2016 -0500 Fix plastimatch problem finding dlib library --- ...ated-dlib-configuration-in-Debian-unstabl.patch | 38 ++++++++++++++++++++++ debian/patches/Fix-test-dependencies.patch | 32 ------------------ ...lm_version.h-from-list-of-installed-files.patch | 20 ------------ debian/patches/series | 1 + 4 files changed, 39 insertions(+), 52 deletions(-) diff --git a/debian/patches/Fix-for-updated-dlib-configuration-in-Debian-unstabl.patch b/debian/patches/Fix-for-updated-dlib-configuration-in-Debian-unstabl.patch new file mode 100644 index 0000000..14aefaf --- /dev/null +++ b/debian/patches/Fix-for-updated-dlib-configuration-in-Debian-unstabl.patch @@ -0,0 +1,38 @@ +From e0113cec2339e9f595d8596d6696930fe90136e5 Mon Sep 17 00:00:00 2001 +From: "Gregory C. Sharp" <gregsharp....@yahoo.com> +Date: Mon, 5 Dec 2016 15:32:12 -0500 +Subject: [PATCH] Fix for updated dlib configuration in Debian unstable + +--- + CMakeLists.txt | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a51daaac..e3d690e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -365,10 +365,17 @@ add_subdirectory (libs/devillard) + ##----------------------------------------------------------------------------- + ## If using local dlib + ##----------------------------------------------------------------------------- +-if (NOT DLIB_FOUND) +- set (DLIB_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/dlib-19.1") +- set (DLIB_LIBRARIES "") +- set (DLIB_HAVE_LIBRARY FALSE) ++if (dlib_FOUND) ++ set (DLIB_INCLUDE_DIR ${dlib_INCLUDE_DIR}) ++ set (DLIB_LIBRARIES ${dlib_LIBRARIES}) ++ set (DLIB_FOUND ++endif () ++if (DLIB_FOUND) ++ set (DLIB_HAVE_LIBRARY TRUE) ++else () ++ set (DLIB_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/libs/dlib-19.1") ++ set (DLIB_LIBRARIES "") ++ set (DLIB_HAVE_LIBRARY FALSE) + endif () + + ##----------------------------------------------------------------------------- +-- +2.11.0 + diff --git a/debian/patches/Fix-test-dependencies.patch b/debian/patches/Fix-test-dependencies.patch deleted file mode 100644 index 4d8eab8..0000000 --- a/debian/patches/Fix-test-dependencies.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Ghislain Antony Vaillant <ghisv...@gmail.com> -Date: Wed, 30 Nov 2016 09:57:47 +0000 -Subject: Fix test dependencies. - ---- - Testing/CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt -index 10455f6..1e9508a 100644 ---- a/Testing/CMakeLists.txt -+++ b/Testing/CMakeLists.txt -@@ -4202,7 +4202,7 @@ plmtest_check_interval ("vf-invert-trans-1-check" - "-10.0" - "-9.9" - ) --set_tests_properties (vf-invert-trans-1 PROPERTIES DEPENDS vf-trans) -+set_tests_properties (vf-invert-trans-1 PROPERTIES DEPENDS vf-trans-1) - set_tests_properties (vf-invert-trans-1-stats - PROPERTIES DEPENDS vf-invert-trans-1) - set_tests_properties (vf-invert-trans-1-check -@@ -4401,8 +4401,8 @@ plm_add_test ( - ${PLM_PLASTIMATCH_PATH}/wed - "${PLM_BUILD_TESTING_DIR}/wed-c.txt" - ) --set_tests_properties (wed-b PROPERTIES DEPENDS lung-1) --set_tests_properties (wed-b PROPERTIES DEPENDS wed-a) -+set_tests_properties (wed-c PROPERTIES DEPENDS lung-1) -+set_tests_properties (wed-c PROPERTIES DEPENDS wed-a) - - ## ------------------------------------------------------------------------- - ## i hate myself diff --git a/debian/patches/Remove-plm_version.h-from-list-of-installed-files.patch b/debian/patches/Remove-plm_version.h-from-list-of-installed-files.patch deleted file mode 100644 index c07a115..0000000 --- a/debian/patches/Remove-plm_version.h-from-list-of-installed-files.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: "Gregory C. Sharp" <gregsharp....@yahoo.com> -Date: Tue, 16 Aug 2016 18:19:30 -0400 -Subject: Remove plm_version.h from list of installed files - ---- - src/plastimatch/sys/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/plastimatch/sys/CMakeLists.txt b/src/plastimatch/sys/CMakeLists.txt -index e2dbbbe..c0acc19 100644 ---- a/src/plastimatch/sys/CMakeLists.txt -+++ b/src/plastimatch/sys/CMakeLists.txt -@@ -34,7 +34,6 @@ set (PLMSYS_LIBRARY_SRC - plm_sleep.cxx plm_sleep.h - plm_timer.cxx plm_timer.h plm_timer_p.h - plm_va_copy.h -- plm_version.h - print_and_exit.cxx print_and_exit.h - smart_pointer.h - string_util.cxx string_util.h diff --git a/debian/patches/series b/debian/patches/series index e69de29..649ac7d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +Fix-for-updated-dlib-configuration-in-Debian-unstabl.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plastimatch.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit