[caffe] 01/01: fix 862528

[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 2e44e6e30b6777d7feb61a54a1a2e038ad96bdef
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon May 15 02:09:35 2017 +0000

    fix 862528
---
 debian/changelog                                  |  7 ++++
 debian/libcaffe-cpu-dev.install.in                |  2 +-
 debian/patches/cmake-change-static-lib-name.patch | 44 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d2ef7a1..270bd7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+caffe (1.0.0-2) experimental; urgency=medium
+
+  * Rename static library libproto.a -> libcaffeproto.a and add it back
+    to the -dev package. (Closes: #862528)
+
+ -- Zhou Mo <cdluminate at gmail.com>  Mon, 15 May 2017 02:08:06 +0000
+
 caffe (1.0.0-1) experimental; urgency=medium
 
   * New upstream release. The first upstream stable release.
diff --git a/debian/libcaffe-cpu-dev.install.in b/debian/libcaffe-cpu-dev.install.in
index a903dd3..96666c2 100644
--- a/debian/libcaffe-cpu-dev.install.in
+++ b/debian/libcaffe-cpu-dev.install.in
@@ -1,4 +1,4 @@
-#usr/lib/libproto.a usr/lib/#DEB_HOST_MULTIARCH#/caffe/
+usr/lib/libcaffeproto.a usr/lib/#DEB_HOST_MULTIARCH#/
 usr/lib/#DEB_HOST_MULTIARCH#/libcaffe.so usr/lib/#DEB_HOST_MULTIARCH#/
 usr/include/caffe/* usr/include/caffe/
 usr/share/Caffe/* usr/share/caffe/
diff --git a/debian/patches/cmake-change-static-lib-name.patch b/debian/patches/cmake-change-static-lib-name.patch
new file mode 100644
index 0000000..a235a1c
--- /dev/null
+++ b/debian/patches/cmake-change-static-lib-name.patch
@@ -0,0 +1,44 @@
+diff --git a/src/caffe/CMakeLists.txt b/src/caffe/CMakeLists.txt
+index b9152e9..4a80556 100644
+--- a/src/caffe/CMakeLists.txt
++++ b/src/caffe/CMakeLists.txt
+@@ -3,12 +3,12 @@ file(GLOB proto_files proto/*.proto)
+ caffe_protobuf_generate_cpp_py(${proto_gen_folder} proto_srcs proto_hdrs proto_python ${proto_files})
+ 
+ # include python files either to force generation
+-add_library(proto STATIC ${proto_hdrs} ${proto_srcs} ${proto_python})
+-caffe_default_properties(proto)
+-target_link_libraries(proto PUBLIC ${PROTOBUF_LIBRARIES})
+-target_include_directories(proto PUBLIC ${PROTOBUF_INCLUDE_DIR})
++add_library(caffeproto STATIC ${proto_hdrs} ${proto_srcs} ${proto_python})
++caffe_default_properties(caffeproto)
++target_link_libraries(caffeproto PUBLIC ${PROTOBUF_LIBRARIES})
++target_include_directories(caffeproto PUBLIC ${PROTOBUF_INCLUDE_DIR})
+ 
+-list(INSERT Caffe_LINKER_LIBS 0 PUBLIC proto) # note, crucial to prepend!
++list(INSERT Caffe_LINKER_LIBS 0 PUBLIC caffeproto) # note, crucial to prepend!
+ 
+ # --[ Caffe library
+ 
+@@ -42,7 +42,7 @@ set_target_properties(caffe PROPERTIES
+ # ---[ Install
+ 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})
++install(TARGETS caffe caffeproto EXPORT CaffeTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ file(WRITE ${PROJECT_BINARY_DIR}/__init__.py)
+ list(APPEND proto_python ${PROJECT_BINARY_DIR}/__init__.py)
+diff --git a/cmake/ConfigGen.cmake b/cmake/ConfigGen.cmake
+index ad91f54..09bb09b 100644
+--- a/cmake/ConfigGen.cmake
++++ b/cmake/ConfigGen.cmake
+@@ -33,7 +33,7 @@ function(caffe_generate_export_configs)
+   configure_file("cmake/Templates/CaffeConfig.cmake.in" "${PROJECT_BINARY_DIR}/CaffeConfig.cmake" @ONLY)
+ 
+   # Add targets to the build-tree export set
+-  export(TARGETS caffe proto FILE "${PROJECT_BINARY_DIR}/CaffeTargets.cmake")
++  export(TARGETS caffe caffeproto FILE "${PROJECT_BINARY_DIR}/CaffeTargets.cmake")
+   export(PACKAGE Caffe)
+ 
+   # ---[ Configure install-tree CaffeConfig.cmake file ]---
diff --git a/debian/patches/series b/debian/patches/series
index e6a2974..10d6a91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ cmake-using-basic-blas
 cmake-fix-python-module-installdir
 fix-more-float-comparison-precision-issue2
 cmake-link-correct-python-lib.patch
+cmake-change-static-lib-name.patch

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