[caffe] 04/08: patch: removed merged patch cmake-using-gnuinstalldirs

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository caffe.

commit d2b16b8e7051eecdc494d34c16e89211395be354
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Apr 17 02:27:26 2017 +0000

    patch: removed merged patch cmake-using-gnuinstalldirs
---
 debian/changelog                          |  2 ++
 debian/patches/cmake-using-gnuinstalldirs | 49 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ecbac1..106875e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 caffe (1.0.0-1) UNRELEASED; urgency=medium
 
   * New upstream release. (The first stable release)
+  * Patchset update:
+    - Remove patch make-using-gnuinstalldirs, which is merged by upstream.
 
  -- Zhou Mo <cdluminate at gmail.com>  Mon, 17 Apr 2017 02:21:16 +0000
 
diff --git a/debian/patches/cmake-using-gnuinstalldirs b/debian/patches/cmake-using-gnuinstalldirs
deleted file mode 100644
index b7837d1..0000000
--- a/debian/patches/cmake-using-gnuinstalldirs
+++ /dev/null
@@ -1,49 +0,0 @@
-using GNUInstallDirs cmake module and fix install paths for Debian
-
-Forwarded: yes
-https://github.com/BVLC/caffe/pull/4237
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,6 +18,7 @@
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
- 
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- include(cmake/Utils.cmake)
- include(cmake/Targets.cmake)
---- a/src/caffe/CMakeLists.txt
-+++ b/src/caffe/CMakeLists.txt
-@@ -40,9 +40,9 @@
-  add_subdirectory(test)
- 
- # ---[ Install
--install(DIRECTORY ${Caffe_INCLUDE_DIR}/caffe DESTINATION include)
--install(FILES ${proto_hdrs} DESTINATION include/caffe/proto)
--install(TARGETS caffe proto EXPORT CaffeTargets DESTINATION lib)
-+install(DIRECTORY ${Caffe_INCLUDE_DIR}/caffe DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-+install(FILES ${proto_hdrs} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caffe/proto)
-+install(TARGETS caffe proto EXPORT CaffeTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- file(WRITE ${PROJECT_BINARY_DIR}/__init__.py)
- list(APPEND proto_python ${PROJECT_BINARY_DIR}/__init__.py)
---- a/tools/CMakeLists.txt
-+++ b/tools/CMakeLists.txt
-@@ -25,5 +25,5 @@
-   endif()
- 
-   # Install
--  install(TARGETS ${name} DESTINATION bin)
-+  install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
- endforeach(source)
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -19,7 +19,7 @@
-   caffe_set_solution_folder(${name} examples)
- 
-   # install
--  install(TARGETS ${name} DESTINATION bin)
-+  install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
-   if(UNIX OR APPLE)
-     # Funny command to make tutorials work
diff --git a/debian/patches/series b/debian/patches/series
index ee52507..6fa1986 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 cmake-using-basic-blas
-cmake-using-gnuinstalldirs
 cmake-fix-python-module-installdir
 fix-more-float-comparison-precision-issue
 fix-more-float-comparison-precision-issue2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git