[caffe] 243/249: dquilt: refresh patches after importing new version

Zhou Mo cdluminate-guest at moszumanska.debian.org
Tue Mar 8 14:51:48 UTC 2016


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

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit d37d0ebe2fe72ebc6d592bf6c188982bf7d1db02
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Dec 12 07:33:37 2015 +0000

    dquilt: refresh patches after importing new version
---
 debian/patches/add-cmake-ld-group.patch                              | 4 ++--
 debian/patches/avoid-cmake-configgen-error.patch                     | 2 +-
 debian/patches/fix-cmake-add-target-property-version-soversion.patch | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/patches/add-cmake-ld-group.patch b/debian/patches/add-cmake-ld-group.patch
index f89625c..06fca52 100644
--- a/debian/patches/add-cmake-ld-group.patch
+++ b/debian/patches/add-cmake-ld-group.patch
@@ -6,8 +6,8 @@
 +set(Caffe_LINKER_LIBS "-Wl,--start-group")
  
  # ---[ Boost
- find_package(Boost 1.46 REQUIRED COMPONENTS system thread)
-@@ -156,3 +156,6 @@
+ find_package(Boost 1.46 REQUIRED COMPONENTS system thread filesystem)
+@@ -170,3 +170,6 @@
  if(BUILD_docs)
    find_package(Doxygen)
  endif()
diff --git a/debian/patches/avoid-cmake-configgen-error.patch b/debian/patches/avoid-cmake-configgen-error.patch
index f75c8e4..0a3bc96 100644
--- a/debian/patches/avoid-cmake-configgen-error.patch
+++ b/debian/patches/avoid-cmake-configgen-error.patch
@@ -1,6 +1,6 @@
 --- a/cmake/ConfigGen.cmake
 +++ b/cmake/ConfigGen.cmake
-@@ -77,7 +77,7 @@
+@@ -92,7 +92,7 @@
    # remove source and build dir includes
    caffe_get_items_with_prefix(${PROJECT_SOURCE_DIR} Caffe_INCLUDE_DIRS __insource)
    caffe_get_items_with_prefix(${PROJECT_BINARY_DIR} Caffe_INCLUDE_DIRS __inbinary)
diff --git a/debian/patches/fix-cmake-add-target-property-version-soversion.patch b/debian/patches/fix-cmake-add-target-property-version-soversion.patch
index 1ce3125..0828d0a 100644
--- a/debian/patches/fix-cmake-add-target-property-version-soversion.patch
+++ b/debian/patches/fix-cmake-add-target-property-version-soversion.patch
@@ -15,7 +15,7 @@ in order to add SONAME for Debian package.
      add_dependencies(${target} ${external_project_dependencies})
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,6 +3,9 @@
+@@ -9,6 +9,9 @@
  # ---[ Caffe project
  project(Caffe C CXX)
  

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



More information about the debian-science-commits mailing list