Merge pull request #30405 from p-se/wip-pna-ubuntu-disco-deps

author Kefu Chai <kchai@redhat.com>

Thu, 19 Sep 2019 02:01:07 +0000 (10:01 +0800)

committer GitHub <noreply@github.com>

Thu, 19 Sep 2019 02:01:07 +0000 (10:01 +0800)
author Kefu Chai <kchai@redhat.com>
Thu, 19 Sep 2019 02:01:07 +0000 (10:01 +0800)
committer GitHub <noreply@github.com>
Thu, 19 Sep 2019 02:01:07 +0000 (10:01 +0800)
diff --cc debian/control
Simple merge
diff --cc install-deps.sh
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Thu, 19 Sep 2019 02:01:07 +0000 (10:01 +0800)
committer	GitHub <noreply@github.com>
	Thu, 19 Sep 2019 02:01:07 +0000 (10:01 +0800)
		1	2
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
install-deps.sh	patch \|	diff1 \|	diff2 \|	blob \| history