debian/Makedef-debian

+# Generic Makedef for Debian
+
+RANLIB=ranlib
+
+# the base directory: 
+
+VSTREEBASEDIR=${DIRVSTREE}
+
+# we redefine it and later remove the next line in other directories
+
+VSTREEBASEDIR=..
+
+# the include directory path
+
+INCLUDEOPT=-I${VSTREEBASEDIR}/include
+
+# the following should be used to define the CFLAGS
+
+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
+
+# the following should be used to define the LDFLAGS
+
+DEFINELDFLAGS:=${LDFLAGS}
+
+# this is used to define the flags for the preprocessor
+
+DEFINECPPFLAGS:=${CPPFLAGS} ${INCLUDEOPT}
+
+# this is used to trigger the use of pointers in Mkvtree
+
+DEFINESUFFIXPTR=-DSUFFIXPTR
+
+# use the sysconf command
+
+WITHSYSCONF=-DWITHSYSCONF
+
+# the following defines the libraries usually used
+
+DEFINELDLIBS=-lm -ldl -lpthread
+
+# the following is defined to properly compile shared libraries
+
+SHARED=-shared
+SHAREDSUFFIX=so
+# the following defines the flags for splint
+DEFINESPLINTFLAGS=${DEFINECPPFLAGS} -DDEBUG -f ../Splintoptions
+
+# the loader is the same as the compiler
+
+LD=${CC}
+
+# the libraries implemented in the vstree package
+
+PATHEND=libfiles
+LIBBASEDIR=lib/${PATHEND}
+COMPILEDIRPREFIX=../${LIBBASEDIR}
+EXECDIRPREFIX=../${LIBBASEDIR}
+LIBDIR=${VSTREEBASEDIR}/${LIBBASEDIR}
+LIBKURTZBASIC=${LIBDIR}/libkurtz-basic.a
+LIBKURTZBASICDBG=${LIBDIR}/libkurtz-basic.dbg.a
+LIBKURTZ=${LIBDIR}/libkurtz.a
+LIBKURTZDBG=${LIBDIR}/libkurtz.dbg.a
+LIBKURTZEXTRA=${LIBDIR}/libkurtzextra.a
+LIBKURTZEXTRADBG=${LIBDIR}/libkurtzextra.dbg.a
+LIBMKVTREE=${LIBDIR}/libmkvtree.a
+LIBMKVTREEDBG=${LIBDIR}/libmkvtree.dbg.a
+LIBVMENGINE=${LIBDIR}/libvmengine.a
+LIBVMENGINEDBG=${LIBDIR}/libvmengine.dbg.a
+LIBVMATCH=${LIBDIR}/libvmatch.a
+LIBVMATCHDBG=${LIBDIR}/libvmatch.dbg.a
+LIBCHAIN=${LIBDIR}/libchain.a
+LIBCHAINDBG=${LIBDIR}/libchain.dbg.a
+LIBAUTOMATA=${LIBDIR}/libautomata.a
+LIBAUTOMATADBG=${LIBDIR}/libautomata.dbg.a
+LIBMULTIMAT=${LIBDIR}/libmultimat.a
+LIBMULTIMATDBG=${LIBDIR}/libmultimat.dbg.a

debian/changelog

-vmatch (2.3.1+dfsg-1) UNRELEASED; urgency=medium
+vmatch (2.3.1+dfsg-1) unstable; urgency=medium
 
   * Sync packaged version with upstream tags.
-  * Fix building on various archs by addressing -m32/-m64 handling.
+  * Hopefully fix building on various archs by removing -m32/-m64 handling.
+  * Add and extend reproducibility patch. Thanks to Chris Lamb.
+  * Bump Standards-Version.
 
- -- Sascha Steinbiss <satta@debian.org>  Mon, 20 Jan 2020 11:23:27 +0100
+ -- Sascha Steinbiss <satta@debian.org>  Tue, 21 Jan 2020 21:48:45 +0100
 
 vmatch (2.3.0+git20200101.0.b1bd228+dfsg-1) unstable; urgency=medium
 

debian/control

@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 12),
                zlib1g-dev,
                libbz2-dev,
                asciidoctor
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/vmatch
 Vcs-Git: https://salsa.debian.org/med-team/vmatch.git
 Homepage: http://www.vmatch.de

debian/patches/common-distdir.patch

@@ -15,29 +15,3 @@ Last-Update: 2020-01-03
  VMATCHDISTDIR:="$(DISTDIR)/$(VMATCHDISTBASENAME)"
  
  SELECTDIR=SELECT
---- a/src/Makedef-linux-gcc
-+++ b/src/Makedef-linux-gcc
-@@ -57,8 +57,8 @@
- 
- # the libraries implemented in the vstree package
- 
--PATHEND=32bit
--LIBBASEDIR=lib/${CONFIGGUESS}/${PATHEND}
-+PATHEND=libfiles
-+LIBBASEDIR=lib/${PATHEND}
- COMPILEDIRPREFIX=../${LIBBASEDIR}
- EXECDIRPREFIX=../${LIBBASEDIR}
- LIBDIR=${VSTREEBASEDIR}/${LIBBASEDIR}
---- a/src/Makedef-linux-gcc-64
-+++ b/src/Makedef-linux-gcc-64
-@@ -61,8 +61,8 @@
- 
- # the libraries implemented in the vstree package
- 
--PATHEND=64bit
--LIBBASEDIR=lib/${CONFIGGUESS}/${PATHEND}
-+PATHEND=libfiles
-+LIBBASEDIR=lib/${PATHEND}
- COMPILEDIRPREFIX=../${LIBBASEDIR}
- EXECDIRPREFIX=../${LIBBASEDIR}
- LIBDIR=${VSTREEBASEDIR}/${LIBBASEDIR}

debian/patches/remove-hardcoded-includepaths.patch

-Description: remove hardcoded include paths
-Author: Sascha Steinbiss <satta@debian.org>
-Last-Update: 2020-01-03
---- a/src/Makedef-linux-gcc
-+++ b/src/Makedef-linux-gcc
-@@ -15,9 +15,7 @@
- 
- # the include directory path
- 
--INCLUDEOPT=-I${VSTREEBASEDIR}/include\
--           -I${VSTREEBASEDIR}/../../genometools/src/external/zlib-1.2.8 \
--           -I${VSTREEBASEDIR}/../../genometools/src/external/bzip2-1.0.6
-+INCLUDEOPT=-I${VSTREEBASEDIR}/include
- 
- # the following should be used to define the CFLAGS
- 
---- a/src/Makedef-linux-gcc-64
-+++ b/src/Makedef-linux-gcc-64
-@@ -15,9 +15,7 @@
- 
- # the include directory path
- 
--INCLUDEOPT=-I${VSTREEBASEDIR}/include \
--           -I${VSTREEBASEDIR}/../../genometools/src/external/zlib-1.2.8 \
--           -I../../../genometools/src/external/bzip2-1.0.6
-+INCLUDEOPT=-I${VSTREEBASEDIR}/include
- 
- # the following should be used to define the CFLAGS
- 

debian/patches/reproducible-build.patch

+Description: Make the build reproducible
+Author: Chris Lamb <lamby@debian.org>
+Last-Update: 2020-01-20
+
+--- a/src/bin/vmrelease.sh
++++ b/src/bin/vmrelease.sh
+@@ -22,14 +22,21 @@
+ #define ${PROGRAM}RELEASE_H
+ ENDOFRELEASEPRE
+ 
+-date +"#define ${PROGRAM}COMPILEDATE \"%Y-%m-%d %H:%M:%S\""
++date +"#define ${PROGRAM}COMPILEDATE \"%Y-%m-%d %H:%M:%S\"" --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"
+ 
+ shift # get rid of first argument
+-echo "#define ${PROGRAM}CFLAGS \"$*\""
++echo "#define ${PROGRAM}CFLAGS \"(reproducible build)\""
++
++if [ -e "${SOURCE_DATE_EPOCH}" ]
++then
++  HOSTNAME="(reproducible build)"
++else
++  HOSTNAME="`hostname`"
++fi
+ 
+ cat << ENDOFRELEASEPOST
+ #define ${PROGRAM}RELEASEDATE "2007-Aug-27"
+ #define ${PROGRAM}VERSION "`cat ${WORKVSTREESRC}/VERSION`"
+-#define ${PROGRAM}COMPILEHOST "`hostname`"
++#define ${PROGRAM}COMPILEHOST "${HOSTNAME}"
+ #endif
+ ENDOFRELEASEPOST

debian/patches/series

 no-symlink.patch
 use-shared-gt-lib.patch
-remove-hardcoded-includepaths.patch
 common-distdir.patch
 skip-doc-installation.patch
 hardening.patch
+reproducible-build.patch

debian/rules

 #!/usr/bin/make -f
 
-include /usr/share/dpkg/default.mk
-
-BITS:=$(shell dpkg-architecture | fgrep DEB_TARGET_ARCH_BITS= | cut -f 2 -d'=')
-
-ifeq ($(BITS),64)
-  VSTREE_ARCH:=linux-gcc-64
-else
-  VSTREE_ARCH:=linux-gcc
-endif
-
 DH_VERBOSE := 1
 export LC_ALL=C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
@@ -20,10 +10,11 @@ export WORKVSTREESRC=$(CURDIR)/src
 	dh $@
 
 override_dh_auto_clean:
-	rm -rf debian/man
+	rm -rf debian/man src/Makedef-debian
 
 override_dh_auto_build:
-	cd src && mklink.sh $(VSTREE_ARCH)
+	cp debian/Makedef-debian src/Makedef-debian
+	cd src && mklink.sh debian
 	cd src && make licensemanager=no $*
 
 override_dh_auto_install: