[med-svn] [salmon] 01/01: be more specific in builddeps
Michael Crusoe
misterc-guest at moszumanska.debian.org
Sun Sep 20 02:57:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
misterc-guest pushed a commit to branch master
in repository salmon.
commit 47542d9b33172175a4dd30d8c9381f1cb8be8e47
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date: Sat Sep 19 19:38:59 2015 -0700
be more specific in builddeps
& describe patches
---
debian/control | 4 ++--
debian/patches/cmake-adj | 2 ++
debian/patches/dependency-fix | 2 ++
debian/patches/jellyfish-update | 3 +++
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 4886d86..cfda684 100644
--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 9),
libboost-serialization-dev,
libbz2-dev,
liblzma-dev,
- jellyfish,
- bwa,
+ libjellyfish-2.0-dev (>> 2.2.3-2),
+ libbwa-dev,
pkg-config,
libjemalloc-dev,
libcereal-dev,
diff --git a/debian/patches/cmake-adj b/debian/patches/cmake-adj
index 2835162..2225d7f 100644
--- a/debian/patches/cmake-adj
+++ b/debian/patches/cmake-adj
@@ -1,3 +1,5 @@
+Author: Michael R. Crusoe <crusoe at ucdavis.edu>
+Description: Use the symbolic name for the build directory, don't hardcode it
--- salmon.orig/cmake/TestSalmon.cmake
+++ salmon/cmake/TestSalmon.cmake
@@ -7,7 +7,7 @@
diff --git a/debian/patches/dependency-fix b/debian/patches/dependency-fix
index f3b3b59..6f061df 100644
--- a/debian/patches/dependency-fix
+++ b/debian/patches/dependency-fix
@@ -1,3 +1,5 @@
+Author: Michael R. Crusoe <crusoe at ucdavis.edu>
+Description: Use Debian version of dependencies, don't download them
--- salmon.orig/CMakeLists.txt
+++ salmon/CMakeLists.txt
@@ -22,7 +22,7 @@
diff --git a/debian/patches/jellyfish-update b/debian/patches/jellyfish-update
index 9349b44..dcc02f4 100644
--- a/debian/patches/jellyfish-update
+++ b/debian/patches/jellyfish-update
@@ -1,3 +1,6 @@
+Author: Michael R. Crusoe
+Description: There is a newer version of libjellyfish in Debian, update to
+match.
--- salmon.orig/src/merge_files.cc
+++ salmon/src/merge_files.cc
@@ -29,6 +29,8 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/salmon.git
More information about the debian-med-commit
mailing list