[med-svn] [plastimatch] 06/06: Remove obsolete patches

[Greg Sharp]

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

gregsharp-guest pushed a commit to branch master
in repository plastimatch.

commit 8cdb1311557530ba204b59f849a58ef0baad389a
Author: Gregory C. Sharp <gregsharp.geo at yahoo.com>
Date:   Wed Oct 11 13:24:11 2017 -0400

    Remove obsolete patches
---
 debian/changelog                                   |  1 +
 ...ated-dlib-configuration-in-Debian-unstabl.patch | 38 ----------------------
 ...-dependency-of-plmsys-library-depending-o.patch | 29 -----------------
 debian/patches/series                              |  2 --
 4 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 884053f..b5e6e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ plastimatch (1.6.6+dfsg.1-1) UNRELEASED; urgency=medium
   [ Gregory C. Sharp ]
   * New upstream release
   * Update watch file for new gitlab naming scheme
+  * Remove obsolete patches
 
  -- Gregory C. Sharp <gregsharp.geo at yahoo.com>  Wed, 11 Oct 2017 12:48:13 -0400
 
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
deleted file mode 100644
index 0dedf8c..0000000
--- a/debian/patches/Fix-for-updated-dlib-configuration-in-Debian-unstabl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e0113cec2339e9f595d8596d6696930fe90136e5 Mon Sep 17 00:00:00 2001
-From: "Gregory C. Sharp" <gregsharp.geo at 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 TRUE)
-+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-missing-dependency-of-plmsys-library-depending-o.patch b/debian/patches/Fix-missing-dependency-of-plmsys-library-depending-o.patch
deleted file mode 100644
index 56a914b..0000000
--- a/debian/patches/Fix-missing-dependency-of-plmsys-library-depending-o.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e8304dbcb053e05d48d3743ba7f348e7143356c5 Mon Sep 17 00:00:00 2001
-From: "Gregory C. Sharp" <gregsharp.geo at yahoo.com>
-Date: Mon, 5 Dec 2016 18:24:55 -0500
-Subject: [PATCH] Fix missing dependency of plmsys library depending on dlib
- library
-
----
- src/plastimatch/sys/CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/plastimatch/sys/CMakeLists.txt b/src/plastimatch/sys/CMakeLists.txt
-index c0acc19c..dbb11920 100644
---- a/src/plastimatch/sys/CMakeLists.txt
-+++ b/src/plastimatch/sys/CMakeLists.txt
-@@ -53,8 +53,9 @@ endforeach ()
- ##-----------------------------------------------------------------------------
- ##  LIBRARY DEPENDENCIES
- ##-----------------------------------------------------------------------------
--set (PLMSYS_LIBRARY_DEPENDENCIES 
--    )
-+set (PLMSYS_LIBRARY_DEPENDENCIES
-+  ${DLIB_LIBRARIES}
-+  )
- if (LIBDL_FOUND)
-     set (PLMSYS_LIBRARY_DEPENDENCIES
- 	${PLMSYS_LIBRARY_DEPENDENCIES}
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 97a68a5..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-Fix-for-updated-dlib-configuration-in-Debian-unstabl.patch
-Fix-missing-dependency-of-plmsys-library-depending-o.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plastimatch.git