[med-svn] [libvcflib] 02/02: Try to use filevercmp.h from gnulib

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libvcflib.

commit 0010e4c9f8ffc1425f6e0e27ad76b0f1b3a0029c
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 23 10:43:49 2016 +0200

    Try to use filevercmp.h from gnulib
---
 debian/control                              |  3 ++-
 debian/patches/filevercmp.h.patch           | 18 ++++++++++++++++++
 debian/patches/ignore_smith_watermann.patch | 10 ----------
 debian/patches/series                       |  1 +
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index a9a7096..645aba3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 9),
                python-markdown,
                libtabixpp-dev,
                libsmithwaterman-dev,
-               pkg-config
+               pkg-config,
+               gnulib
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libvcflib.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libvcflib.git
diff --git a/debian/patches/filevercmp.h.patch b/debian/patches/filevercmp.h.patch
new file mode 100644
index 0000000..1b67466
--- /dev/null
+++ b/debian/patches/filevercmp.h.patch
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 23 Jun 2016 09:10:54 +0200
+Description: Use filevercmp.h from gnulib package
+ Upstream provides a copy of the code inside gnulib at
+    https://github.com/ekg/filevercmp
+ but we can use the Debian packaged code
+
+--- a/Makefile
++++ b/Makefile
+@@ -186,7 +186,7 @@ $(FASTAHACK): pre
+ #	cd fsom && $(CXX) $(CXXFLAGS) -c fsom.c -lm
+ 
+ $(FILEVERCMP): pre
+-	cd filevercmp && make && cp *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && cp *.o $(VCF_LIB_LOCAL)/$(INC_DIR)/
++	cp /usr/share/gnulib/lib/filevercmp.h $(VCF_LIB_LOCAL)/$(INC_DIR)/
+ 
+ $(SHORTBINS): pre
+ 	$(MAKE) bin/$@
diff --git a/debian/patches/ignore_smith_watermann.patch b/debian/patches/ignore_smith_watermann.patch
index 9868e67..f5bbcf4 100644
--- a/debian/patches/ignore_smith_watermann.patch
+++ b/debian/patches/ignore_smith_watermann.patch
@@ -33,16 +33,6 @@
  
  $(DISORDER): $(SMITHWATERMAN)
  
-@@ -183,7 +186,8 @@ $(FASTAHACK): pre
- #	cd fsom && $(CXX) $(CXXFLAGS) -c fsom.c -lm
- 
- $(FILEVERCMP): pre
--	cd filevercmp && make && cp *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && cp *.o $(VCF_LIB_LOCAL)/$(INC_DIR)/
-+	echo "Source does not contain dir filevercmp"
-+	# cd filevercmp && make && cp *.h* $(VCF_LIB_LOCAL)/$(INC_DIR)/ && cp *.o $(VCF_LIB_LOCAL)/$(INC_DIR)/
- 
- $(SHORTBINS): pre
- 	$(MAKE) bin/$@
 @@ -220,7 +224,7 @@ clean:
  	rm -rf $(INC_DIR)
  	rm -rf $(OBJ_DIR)
diff --git a/debian/patches/series b/debian/patches/series
index db0e782..3004089 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 use_debian_packaged_tabixpp.patch
 ignore_smith_watermann.patch
 multichoose.h.patch
+filevercmp.h.patch

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