Commit 957ece6aa003d5d28fe50dc88a52c92d3f21d462 - vmatch

+76

-0

debian/Makedef-debian less more

	0	# Generic Makedef for Debian
	1
	2	RANLIB=ranlib
	3
	4	# the base directory:
	5
	6	VSTREEBASEDIR=${DIRVSTREE}
	7
	8	# we redefine it and later remove the next line in other directories
	9
	10	VSTREEBASEDIR=..
	11
	12	# the include directory path
	13
	14	INCLUDEOPT=-I${VSTREEBASEDIR}/include
	15
	16	# the following should be used to define the CFLAGS
	17
	18	DEFINECFLAGS:=${CFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -g -Wstrict-prototypes -O3 -Wundef -Wshadow -Wstrict-prototypes -Wcast-align -Wsign-compare -Wnested-externs -Wall -Wcast-qual -Wpointer-arith -Winline -Werror -Wno-unused-but-set-variable -Wno-cast-qual -Wno-error=maybe-uninitialized -fno-stack-protector -D_GNU_SOURCE -Wno-error=format-overflow
	19
	20	# the following should be used to define the LDFLAGS
	21
	22	DEFINELDFLAGS:=${LDFLAGS}
	23
	24	# this is used to define the flags for the preprocessor
	25
	26	DEFINECPPFLAGS:=${CPPFLAGS} ${INCLUDEOPT}
	27
	28	# this is used to trigger the use of pointers in Mkvtree
	29
	30	DEFINESUFFIXPTR=-DSUFFIXPTR
	31
	32	# use the sysconf command
	33
	34	WITHSYSCONF=-DWITHSYSCONF
	35
	36	# the following defines the libraries usually used
	37
	38	DEFINELDLIBS=-lm -ldl -lpthread
	39
	40	# the following is defined to properly compile shared libraries
	41
	42	SHARED=-shared
	43	SHAREDSUFFIX=so
	44	# the following defines the flags for splint
	45	DEFINESPLINTFLAGS=${DEFINECPPFLAGS} -DDEBUG -f ../Splintoptions
	46
	47	# the loader is the same as the compiler
	48
	49	LD=${CC}
	50
	51	# the libraries implemented in the vstree package
	52
	53	PATHEND=libfiles
	54	LIBBASEDIR=lib/${PATHEND}
	55	COMPILEDIRPREFIX=../${LIBBASEDIR}
	56	EXECDIRPREFIX=../${LIBBASEDIR}
	57	LIBDIR=${VSTREEBASEDIR}/${LIBBASEDIR}
	58	LIBKURTZBASIC=${LIBDIR}/libkurtz-basic.a
	59	LIBKURTZBASICDBG=${LIBDIR}/libkurtz-basic.dbg.a
	60	LIBKURTZ=${LIBDIR}/libkurtz.a
	61	LIBKURTZDBG=${LIBDIR}/libkurtz.dbg.a
	62	LIBKURTZEXTRA=${LIBDIR}/libkurtzextra.a
	63	LIBKURTZEXTRADBG=${LIBDIR}/libkurtzextra.dbg.a
	64	LIBMKVTREE=${LIBDIR}/libmkvtree.a
	65	LIBMKVTREEDBG=${LIBDIR}/libmkvtree.dbg.a
	66	LIBVMENGINE=${LIBDIR}/libvmengine.a
	67	LIBVMENGINEDBG=${LIBDIR}/libvmengine.dbg.a
	68	LIBVMATCH=${LIBDIR}/libvmatch.a
	69	LIBVMATCHDBG=${LIBDIR}/libvmatch.dbg.a
	70	LIBCHAIN=${LIBDIR}/libchain.a
	71	LIBCHAINDBG=${LIBDIR}/libchain.dbg.a
	72	LIBAUTOMATA=${LIBDIR}/libautomata.a
	73	LIBAUTOMATADBG=${LIBDIR}/libautomata.dbg.a
	74	LIBMULTIMAT=${LIBDIR}/libmultimat.a
	75	LIBMULTIMATDBG=${LIBDIR}/libmultimat.dbg.a

+1

-1

debian/changelog less more

0	0	vmatch (2.3.1+dfsg-1) unstable; urgency=medium
1	1
2	2	* Sync packaged version with upstream tags.
3		* Fix building on various archs by addressing -m32/-m64 handling.
	3	* Hopefully fix building on various archs by removing -m32/-m64 handling.
4	4
5	5	-- Sascha Steinbiss <satta@debian.org> Tue, 21 Jan 2020 21:48:45 +0100
6	6

+1

-27

debian/patches/common-distdir.patch less more

12	12	+VMATCHDISTBASENAME:="vmatch"
13	13	+DISTDIR:="$(CURDIR)/dist"
14	14	VMATCHDISTDIR:="$(DISTDIR)/$(VMATCHDISTBASENAME)"
15
	15
16	16	SELECTDIR=SELECT
17		--- a/src/Makedef-linux-gcc
18		+++ b/src/Makedef-linux-gcc
19		@@ -57,8 +57,8 @@
20
21		# the libraries implemented in the vstree package
22
23		-PATHEND=32bit
24		-LIBBASEDIR=lib/${CONFIGGUESS}/${PATHEND}
25		+PATHEND=libfiles
26		+LIBBASEDIR=lib/${PATHEND}
27		COMPILEDIRPREFIX=../${LIBBASEDIR}
28		EXECDIRPREFIX=../${LIBBASEDIR}
29		LIBDIR=${VSTREEBASEDIR}/${LIBBASEDIR}
30		--- a/src/Makedef-linux-gcc-64
31		+++ b/src/Makedef-linux-gcc-64
32		@@ -61,8 +61,8 @@
33
34		# the libraries implemented in the vstree package
35
36		-PATHEND=64bit
37		-LIBBASEDIR=lib/${CONFIGGUESS}/${PATHEND}
38		+PATHEND=libfiles
39		+LIBBASEDIR=lib/${PATHEND}
40		COMPILEDIRPREFIX=../${LIBBASEDIR}
41		EXECDIRPREFIX=../${LIBBASEDIR}
42		LIBDIR=${VSTREEBASEDIR}/${LIBBASEDIR}

+0

-29

~~debian/patches/remove-hardcoded-includepaths.patch~~ less more

0		Description: remove hardcoded include paths
1		Author: Sascha Steinbiss <satta@debian.org>
2		Last-Update: 2020-01-03
3		--- a/src/Makedef-linux-gcc
4		+++ b/src/Makedef-linux-gcc
5		@@ -15,9 +15,7 @@
6
7		# the include directory path
8
9		-INCLUDEOPT=-I${VSTREEBASEDIR}/include\
10		- -I${VSTREEBASEDIR}/../../genometools/src/external/zlib-1.2.8 \
11		- -I${VSTREEBASEDIR}/../../genometools/src/external/bzip2-1.0.6
12		+INCLUDEOPT=-I${VSTREEBASEDIR}/include
13
14		# the following should be used to define the CFLAGS
15
16		--- a/src/Makedef-linux-gcc-64
17		+++ b/src/Makedef-linux-gcc-64
18		@@ -15,9 +15,7 @@
19
20		# the include directory path
21
22		-INCLUDEOPT=-I${VSTREEBASEDIR}/include \
23		- -I${VSTREEBASEDIR}/../../genometools/src/external/zlib-1.2.8 \
24		- -I../../../genometools/src/external/bzip2-1.0.6
25		+INCLUDEOPT=-I${VSTREEBASEDIR}/include
26
27		# the following should be used to define the CFLAGS
28

+0

-1

debian/patches/series less more

0	0	no-symlink.patch
1	1	use-shared-gt-lib.patch
2		remove-hardcoded-includepaths.patch
3	2	common-distdir.patch
4	3	skip-doc-installation.patch
5	4	hardening.patch

+3

-12

debian/rules less more

0	0	#!/usr/bin/make -f
1
2		include /usr/share/dpkg/default.mk
3
4		BITS:=$(shell dpkg-architecture \| fgrep DEB_TARGET_ARCH_BITS= \| cut -f 2 -d'=')
5
6		ifeq ($(BITS),64)
7		VSTREE_ARCH:=linux-gcc-64
8		else
9		VSTREE_ARCH:=linux-gcc
10		endif
11	1
12	2	DH_VERBOSE := 1
13	3	export LC_ALL=C.UTF-8

19	9	dh $@
20	10
21	11	override_dh_auto_clean:
22		rm -rf debian/man
	12	rm -rf debian/man src/Makedef-debian
23	13
24	14	override_dh_auto_build:
25		cd src && mklink.sh $(VSTREE_ARCH)
	15	cp debian/Makedef-debian src/Makedef-debian
	16	cd src && mklink.sh debian
26	17	cd src && make licensemanager=no $*
27	18
28	19	override_dh_auto_install: