[med-svn] [pbbam] 03/04: Update patches

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository pbbam.

commit f3307ceb23b1861f8e0950ab327ca8c4e095c4ea
Author: Afif Elghraoui <afif at debian.org>
Date:   Sun Oct 30 14:31:22 2016 -0700

    Update patches
---
 debian/patches/dont-try-building-gtest.patch    |  2 +-
 debian/patches/ssl-md5.patch                    | 22 +++++++++++-----------
 debian/patches/use-PATH-for-test-programs.patch |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/dont-try-building-gtest.patch b/debian/patches/dont-try-building-gtest.patch
index df4e13f..d264b33 100644
--- a/debian/patches/dont-try-building-gtest.patch
+++ b/debian/patches/dont-try-building-gtest.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 Last-Update: 2015-09-07
 --- pbbam.orig/CMakeLists.txt
 +++ pbbam/CMakeLists.txt
-@@ -170,16 +170,6 @@
+@@ -174,16 +174,6 @@
  
  if(PacBioBAM_build_tests)
  
diff --git a/debian/patches/ssl-md5.patch b/debian/patches/ssl-md5.patch
index f5153a9..9c4ce98 100644
--- a/debian/patches/ssl-md5.patch
+++ b/debian/patches/ssl-md5.patch
@@ -8,17 +8,17 @@ Description: Use libssl for md5.h rather than cram
  .
  1. https://anonscm.debian.org/cgit/debian-med/htslib.git/tree/cram/md5.h?id=12251926b9d0265738d701bb0add6fe9d070ccb3
  2. http://sourceforge.net/p/samtools/mailman/message/33488076/
-Author: Afif Elghraoui <afif at ghraoui.name>
+Author: Afif Elghraoui <afif at debian.org>
 Forwarded: no
-Last-Update: 2015-09-07
---- pbbam.orig/src/ReadGroupInfo.cpp
-+++ pbbam/src/ReadGroupInfo.cpp
-@@ -42,7 +42,7 @@
- #include "pbbam/ReadGroupInfo.h"
- #include "ChemistryTable.h"
- #include "SequenceUtils.h"
+Last-Update: 2015-10-30
+--- pbbam.orig/src/MD5.cpp
++++ pbbam/src/MD5.cpp
+@@ -40,7 +40,7 @@
+ // Author: Brett Bowman
+ 
+ #include "pbbam/MD5.h"
 -#include <cram/md5.h>
 +#include <openssl/md5.h>
- #include <iomanip>
- #include <set>
- #include <sstream>
+ 
+ namespace PacBio {
+ namespace BAM {
diff --git a/debian/patches/use-PATH-for-test-programs.patch b/debian/patches/use-PATH-for-test-programs.patch
index 1b6c1b7..0d852d5 100644
--- a/debian/patches/use-PATH-for-test-programs.patch
+++ b/debian/patches/use-PATH-for-test-programs.patch
@@ -94,7 +94,7 @@ the build tree.
 +  $ BAM2SAM="bam2sam" && export BAM2SAM
  
    $ DATADIR="$TESTDIR/../../data" && export DATADIR
-   $ INPUT_FOFN="$DATADIR/dataset/merge.fofn" && export INPUT_FOFN
+   $ INPUT_FOFN="$DATADIR/merge.fofn" && export INPUT_FOFN
 --- pbbam.orig/tests/src/cram/pbmerge_mixed_ordering.t
 +++ pbbam/tests/src/cram/pbmerge_mixed_ordering.t
 @@ -1,8 +1,8 @@

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