Merge tag 'debian/8.5' into stretch-bpo

dgit release 8.5 for unstable (sid) [dgit]
[dgit distro=debian]

# gpg: Signature made Mon 27 May 2019 12:24:02 AM BST
# gpg:                using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Good signature from "Ian Jackson (new general purpose key) <ijackson@chiark.greenend.org.uk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 559A E46C 2D6B 6D32 65E7  CBA1 E3E3 3923 48B5 0D39

1 files changed, 60 insertions, 0 deletions

diff --git a/tests/tests/import-linkorigs b/tests/tests/import-linkorigs
new file mode 100755
index 0000000..815f960
--- /dev/null
+++ b/tests/tests/import-linkorigs
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-import-chk
+
+t-tstunt-parsechangelog
+
+t-archive-none example
+v=1.0-1
+
+link_src_files () {
+	mkdir $1
+	cp $troot/pkg-srcs/${p}_* $1
+	dscfn=$1/$dscleaf
+}
+
+combo () {
+	case $bpdhow in
+	none)	bpd=..				;;
+	abs)	bpd=$tmp/$subdir/bpd		;;
+	rel)	bpd=../bpd			;;
+	*)	x-unknown-bpdhow $bpdhow	;;
+	esac
+
+	mkdir -p $bpd
+	git config --local dgit.default.build-products-dir $bpd
+
+	dscleaf=${p}_${v}.dsc
+	dscfn=$troot/pkg-srcs/$dscleaf
+
+	case $dschow in
+	abs)					;;
+	rel)	link_src_files ../copies	;;
+	bpd)	link_src_files $bpd		;;
+	*)	x-unknown-dschow $dschow	;;
+	esac
+
+	t-dgit import-dsc $dscfn +import
+	git reset --hard import
+
+	t-dch-commit -v$v.1 -m 'New version'
+	t-dch-commit-r
+	t-dgit build-source
+}
+
+for bpdhow in none rel abs; do
+	for dschow in rel abs; do
+
+		subdir=$bpdhow-$dschow
+		mkdir $subdir
+		cd $subdir
+
+		mkdir $p
+		cd $p
+
+		git init
+		combo
+		cd ../..
+	done
+done