[med-svn] [fast5] 01/02: Revise autopkgtest to avoid unnecessary patching of upstream source

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository fast5.

commit 08ff753ac31558770964d596d9d65d0e9cf09080
Author: Afif Elghraoui <afif at debian.org>
Date:   Wed Oct 11 23:33:07 2017 -0400

    Revise autopkgtest to avoid unnecessary patching of upstream source
---
 debian/patches/series      |  1 -
 debian/patches/vpath.patch | 21 ---------------------
 debian/tests/control       |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 81052c2..da8b790 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 rpath.patch
-vpath.patch
diff --git a/debian/patches/vpath.patch b/debian/patches/vpath.patch
deleted file mode 100644
index 27024bf..0000000
--- a/debian/patches/vpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Use VPATH to set prerequisites of fast5 headers
- This makes it possible to change the location of the headers while
- still keeping them as prerequisites in the Makefile.
-Author: Afif Elghraoui <afif at debian.org>
-Forwarded: no
-Last-Update: 2017-10-06
---- fast5.orig/src/Makefile
-+++ fast5/src/Makefile
-@@ -19,9 +19,11 @@
- HPPTOOLS_DIR ?= hpptools
- FAST5_DIR ?= ${CURDIR}/../include
- 
-+VPATH += ${FAST5_DIR}
-+
- TARGETS = f5ls f5ls-full hdf5-mod f5-mod
- EXTRA_TARGETS = f5dump f5pack
--HPP_FILES := $(addprefix ${FAST5_DIR}/, fast5.hpp fast5/hdf5_tools.hpp fast5/Huffman_Packer.hpp fast5/Bit_Packer.hpp)
-+HPP_FILES := fast5.hpp fast5/hdf5_tools.hpp fast5/Huffman_Packer.hpp fast5/Bit_Packer.hpp
- 
- CXXFLAGS := -std=c++11 -O0 -g3 -ggdb -fno-eliminate-unused-debug-types -Wall -Wextra -Wpedantic
- CPPFLAGS := -isystem ${HDF5_INCLUDE_DIR} -I $(FAST5_DIR)
diff --git a/debian/tests/control b/debian/tests/control
index 474a4b3..35e925b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,7 @@
 Test-Command:
 	cp /usr/share/doc/libfast5-dev/examples/* $ADTTMP
 	&& cd $ADTTMP
-	&& make VPATH=/usr/include
+	&& make FAST5_DIR=/usr/include
 	HDF5_INCLUDE_DIR=/usr/include/hdf5/serial
 	HDF5_LIB_DIR=/usr/lib/$(gcc -print-multiarch)/hdf5/serial
 Depends:

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