diff -Nru cdbfasta-1.00+git20181005.014498c+dfsg/debian/changelog cdbfasta-1.00+git20181005.014498c+dfsg/debian/changelog --- cdbfasta-1.00+git20181005.014498c+dfsg/debian/changelog 2020-11-10 11:26:05.000000000 +0000 +++ cdbfasta-1.00+git20181005.014498c+dfsg/debian/changelog 2021-01-14 19:32:35.000000000 +0000 @@ -1,8 +1,15 @@ -cdbfasta (1.00+git20181005.014498c+dfsg-1build1) hirsute; urgency=medium +cdbfasta (1.00+git20181005.014498c+dfsg-2) unstable; urgency=medium - * No change rebuild against new libgclib ABI. + [ Helmut Grohne] + * Team upload. + * Improve cross building: (Closes: #980128) + + cross.patch: Make pkg-config substitutable. + + d/rules: Pass a triplet-prefixed g++. - -- Dimitri John Ledkov Tue, 10 Nov 2020 11:26:05 +0000 + [ Nilesh Patra ] + * Declare compliance with policy 4.5.1 + + -- Helmut Grohne Thu, 14 Jan 2021 20:32:35 +0100 cdbfasta (1.00+git20181005.014498c+dfsg-1) unstable; urgency=medium diff -Nru cdbfasta-1.00+git20181005.014498c+dfsg/debian/control cdbfasta-1.00+git20181005.014498c+dfsg/debian/control --- cdbfasta-1.00+git20181005.014498c+dfsg/debian/control 2020-11-10 11:26:05.000000000 +0000 +++ cdbfasta-1.00+git20181005.014498c+dfsg/debian/control 2021-01-14 19:32:35.000000000 +0000 @@ -1,6 +1,5 @@ Source: cdbfasta -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team Uploaders: Steffen Moeller , Andreas Tille , Tim Booth @@ -11,7 +10,7 @@ pkg-config, libgclib-dev, help2man -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/med-team/cdbfasta Vcs-Git: https://salsa.debian.org/med-team/cdbfasta.git Homepage: https://github.com/gpertea/cdbfasta diff -Nru cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/cross.patch cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/cross.patch --- cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/cross.patch 2021-01-14 19:32:35.000000000 +0000 @@ -0,0 +1,19 @@ +--- cdbfasta-1.00+git20181005.014498c+dfsg.orig/Makefile ++++ cdbfasta-1.00+git20181005.014498c+dfsg/Makefile +@@ -1,5 +1,6 @@ + GCLDIR := ./gclib +-SEARCHDIRS := `pkg-config --cflags libgclib` ++PKG_CONFIG ?= pkg-config ++SEARCHDIRS := `$(PKG_CONFIG) --cflags libgclib` + CC := g++ + + BASEFLAGS = -Wall ${SEARCHDIRS} $(MARCH) -DENABLE_COMPRESSION=1 -D_FILE_OFFSET_BITS=64 \ +@@ -42,7 +43,7 @@ + #LDFLAGS = + #uncomment this when ENABLE_COMPRESSION + LDFLAGS := -lz $(LDFLAGS) +-LIBS = `pkg-config --libs libgclib` ++LIBS = `$(PKG_CONFIG) --libs libgclib` + + .PHONY : all + all: cdbfasta cdbyank diff -Nru cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/series cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/series --- cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/series 2020-06-13 10:34:42.000000000 +0000 +++ cdbfasta-1.00+git20181005.014498c+dfsg/debian/patches/series 2021-01-14 19:32:35.000000000 +0000 @@ -1,3 +1,4 @@ workaround-lintian-false-positive hardening.patch use_debian_packaged_gclib.patch +cross.patch diff -Nru cdbfasta-1.00+git20181005.014498c+dfsg/debian/rules cdbfasta-1.00+git20181005.014498c+dfsg/debian/rules --- cdbfasta-1.00+git20181005.014498c+dfsg/debian/rules 2020-06-13 10:34:42.000000000 +0000 +++ cdbfasta-1.00+git20181005.014498c+dfsg/debian/rules 2021-01-14 19:32:35.000000000 +0000 @@ -7,12 +7,13 @@ #export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/buildtools.mk %: dh $@ override_dh_auto_build: - dh_auto_build -- LINKER="g++ $(LDFLAGS)" + dh_auto_build -- LINKER="$(CXX) $(LDFLAGS)" override_dh_installman: help2man --no-info --no-discard-stderr --version-option=-v ./cdbfasta |\