[med-svn] [dindel] 01/04: DEP3 header

[Andreas Tille]

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

tille pushed a commit to branch master
in repository dindel.

commit 1245745e27e18f185f9daf36c45f8587812bb26d
Author: Andreas Tille <tille at debian.org>
Date:   Sat Mar 19 10:53:39 2016 +0100

    DEP3 header
---
 debian/patches/compiler_errors.patch    | 20 ++++++++++----------
 debian/patches/modernize-Makefile.patch | 12 +++++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/patches/compiler_errors.patch b/debian/patches/compiler_errors.patch
index c680a62..1ab3bc7 100644
--- a/debian/patches/compiler_errors.patch
+++ b/debian/patches/compiler_errors.patch
@@ -1,8 +1,10 @@
-Index: dindel-1.01+dfsg/StringHash.hpp
-===================================================================
---- dindel-1.01+dfsg.orig/StringHash.hpp
-+++ dindel-1.01+dfsg/StringHash.hpp
-@@ -32,7 +32,7 @@
+Author: Steffen Möller <moeller at debian.org>
+Last-Update: Fri Mar 18 16:32:43 2016 +0100
+Description: Fix gcc 5.x compatibility
+
+--- a/StringHash.hpp
++++ b/StringHash.hpp
+@@ -32,7 +32,7 @@ using __gnu_cxx::hash;
    
  struct my_hash_funct : public unary_function<string, size_t>
  {	
@@ -11,11 +13,9 @@ Index: dindel-1.01+dfsg/StringHash.hpp
  };
  
  template<class T>  class string_hash : public hash_map<string, T, my_hash_funct> {};
-Index: dindel-1.01+dfsg/DInDel.cpp
-===================================================================
---- dindel-1.01+dfsg.orig/DInDel.cpp
-+++ dindel-1.01+dfsg/DInDel.cpp
-@@ -1566,7 +1566,7 @@
+--- a/DInDel.cpp
++++ b/DInDel.cpp
+@@ -1566,7 +1566,7 @@ bool DetInDel::getHaplotypes(vector<Hapl
  		HDIterator2 hdi(hd, params.maxHap, pos, leftPos, rightPos, params.noIndelWindow);
  
  		double logNumHaps=hdi.getLogNumHaps();
diff --git a/debian/patches/modernize-Makefile.patch b/debian/patches/modernize-Makefile.patch
index d221f62..f223160 100644
--- a/debian/patches/modernize-Makefile.patch
+++ b/debian/patches/modernize-Makefile.patch
@@ -1,7 +1,9 @@
-Index: dindel-1.01+dfsg/Makefile
-===================================================================
---- dindel-1.01+dfsg.orig/Makefile
-+++ dindel-1.01+dfsg/Makefile
+Author: Steffen Möller <moeller at debian.org>
+Last-Update: Fri Mar 18 16:32:43 2016 +0100
+Description: Use Debian packaged libraries
+
+--- a/Makefile
++++ b/Makefile
 @@ -1,9 +1,9 @@
 -SAMTOOLDIR=/nfs/users/nfs_c/caa/source/samtools/
 -SEQANDIR=seqan_library/
@@ -15,7 +17,7 @@ Index: dindel-1.01+dfsg/Makefile
  
  SRCSDINDEL=DInDel.cpp HapBlock.cpp HaplotypeDistribution.cpp ObservationModelFB.cpp GetCandidates.cpp Faster.cpp
  OBJSDINDEL=$(SRCSDINDEL:%.cpp=%.o)  
-@@ -12,4 +12,7 @@
+@@ -12,4 +12,7 @@ dindel:$(OBJSDINDEL) Read.hpp DInDel.hpp
  	$(CXX) -o $@ $(CXXFLAGS) $(DINDELFLAGS) $(OBJSDINDEL) $(LDFLAGS) 
  
  clean:

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