diff -Nru bzr-builddeb-2.8.7/debian/changelog bzr-builddeb-2.8.7ubuntu1/debian/changelog --- bzr-builddeb-2.8.7/debian/changelog 2013-09-10 23:06:04.000000000 +0000 +++ bzr-builddeb-2.8.7ubuntu1/debian/changelog 2013-10-23 09:52:50.000000000 +0000 @@ -1,3 +1,13 @@ +bzr-builddeb (2.8.7ubuntu1) trusty; urgency=low + + * debian/tests/control: Add python-distro-info and libalgorithm-merge-perl + to test depends; the former is required to compare release names and the + latter for dpkg-mergechangelogs to generate the expected output (it does + different things with conflicts in 3-way merges depending on the presence + of this library). + + -- Iain Lane Wed, 23 Oct 2013 10:52:50 +0100 + bzr-builddeb (2.8.7) unstable; urgency=low * tests/blackbox/test_import_dsc.py: diff -Nru bzr-builddeb-2.8.7/debian/control bzr-builddeb-2.8.7ubuntu1/debian/control --- bzr-builddeb-2.8.7/debian/control 2013-09-10 22:52:48.000000000 +0000 +++ bzr-builddeb-2.8.7ubuntu1/debian/control 2013-10-23 10:01:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: bzr-builddeb Section: vcs Priority: optional -Maintainer: Debian Bazaar Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Bazaar Maintainers Uploaders: James Westby , Andrew Starr-Bochicchio Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3), xz-utils Build-Depends-Indep: bzr (>= 2.1~), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-bzrlib.tests | bzr (<< 2.4.0~beta1-2), python-lzma, libalgorithm-merge-perl, python-distro-info, quilt diff -Nru bzr-builddeb-2.8.7/debian/tests/control bzr-builddeb-2.8.7ubuntu1/debian/tests/control --- bzr-builddeb-2.8.7/debian/tests/control 2013-09-10 22:55:00.000000000 +0000 +++ bzr-builddeb-2.8.7ubuntu1/debian/tests/control 2013-10-23 09:51:04.000000000 +0000 @@ -1,3 +1,3 @@ Tests: testsuite -Depends: @, python-bzrlib.tests, python-subunit, python-testtools, python-lzma +Depends: @, python-bzrlib.tests, python-subunit, python-testtools, python-lzma, python-distro-info, libalgorithm-merge-perl Restrictions: allow-stderr