[med-svn] [express] 01/01: enable protobuf, drop zlib

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository express.

commit 5a47e27c912091f69f07ae69841fecf64e8f3711
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Wed Aug 26 16:05:18 2015 -0700

    enable protobuf, drop zlib
---
 debian/control           |  3 ++-
 debian/patches/drop-zlib | 23 +++++++++++++++++++++++
 debian/patches/series    |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 75d43d3..7bb1e99 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 9),
                libboost-tools-dev,
                libgoogle-perftools-dev [amd64 arm64 armel armhf i386 powerpc ppc64el],
                cmake,
-               zlib1g-dev
+               libprotobuf-dev,
+               protobuf-compiler
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/express.git
 Vcs-Git: git://anonscm.debian.org/debian-med/express.git
diff --git a/debian/patches/drop-zlib b/debian/patches/drop-zlib
new file mode 100644
index 0000000..b9486fb
--- /dev/null
+++ b/debian/patches/drop-zlib
@@ -0,0 +1,23 @@
+Description: drop unused zlib dependency
+Author: Michael R. Crusoe <crusoe at ucdavis.edu>
+--- express.orig/CMakeLists.txt
++++ express/CMakeLists.txt
+@@ -45,7 +45,6 @@
+ 	set(CMAKE_CXX_FLAGS "/EHsc")
+ 	set(WIN32_INT 1)
+ else(WIN32)
+-	find_package(ZLIB REQUIRED)
+ 	set(WIN32_INT 0)
+ endif(WIN32)
+ 
+--- express.orig/src/CMakeLists.txt
++++ express/src/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ 
+ add_executable(express ${sources} ${headers} ${PROTO_SOURCES} ${PROTO_HEADERS})
+ 
+-set(LIBRARIES ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
++set(LIBRARIES ${Boost_LIBRARIES})
+ 
+ if (GPERFTOOLS_TCMALLOC) 
+    set(LIBRARIES ${LIBRARIES} "libtcmalloc_minimal.a")
diff --git a/debian/patches/series b/debian/patches/series
index 2c4a4bc..52d84db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 spelling-fixes
 fix-bamtools-path
+drop-zlib

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