diff -Nru simplestreams-0.1.0-484-g21782a0/debian/changelog simplestreams-0.1.0-485-gba75825/debian/changelog --- simplestreams-0.1.0-484-g21782a0/debian/changelog 2019-07-15 19:31:41.000000000 +0000 +++ simplestreams-0.1.0-485-gba75825/debian/changelog 2019-08-19 17:02:18.000000000 +0000 @@ -1,6 +1,6 @@ -simplestreams (0.1.0-484-g21782a0-0ubuntu1~ubuntu14.04.1) trusty; urgency=low +simplestreams (0.1.0-485-gba75825-0ubuntu1~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Launchpad Package Builder Mon, 15 Jul 2019 19:31:41 +0000 + -- Launchpad Package Builder Mon, 19 Aug 2019 17:02:18 +0000 diff -Nru simplestreams-0.1.0-484-g21782a0/debian/git-build-recipe.manifest simplestreams-0.1.0-485-gba75825/debian/git-build-recipe.manifest --- simplestreams-0.1.0-484-g21782a0/debian/git-build-recipe.manifest 2019-07-15 19:31:41.000000000 +0000 +++ simplestreams-0.1.0-485-gba75825/debian/git-build-recipe.manifest 2019-08-19 17:02:18.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 0.1.0-484-g21782a0-0ubuntu1 -lp:simplestreams git-commit:21782a0d0b45b13dca1d712a1c889b68cdb1e4f5 +# git-build-recipe format 0.4 deb-version 0.1.0-485-gba75825-0ubuntu1 +lp:simplestreams git-commit:ba75825ba029990907a4425bca87be8423a251f4 merge trusty-build lp:simplestreams git-commit:570fe8229b53b76b103040f28b982809681c7359 diff -Nru simplestreams-0.1.0-484-g21782a0/tools/make-test-data simplestreams-0.1.0-485-gba75825/tools/make-test-data --- simplestreams-0.1.0-484-g21782a0/tools/make-test-data 2019-07-15 19:31:41.000000000 +0000 +++ simplestreams-0.1.0-485-gba75825/tools/make-test-data 2019-08-19 17:02:17.000000000 +0000 @@ -297,8 +297,10 @@ # create a combined sha256 for lxd.tar.xz (metadata) and the root fs # - combined_sha256 and combined_rootxz_sha256 for the -root.tar.gz # - combined_squashfs_sha256 for the squashfs + # - combined_disk1-img_sha256 for the img ftype = item['ftype'] - for name, extension in (('rootxz', '-root.tar.xz'), + for name, extension in (('disk1-img', '.img'), + ('rootxz', '-root.tar.xz'), ('squashfs', '.squashfs')): if (ftype == "lxd.tar.xz" and 'combined_{}_sha256'.format(name) not in FAKE_DATA[ftype]): @@ -567,7 +569,8 @@ lxd = os.path.basename(path) # find calculated combined checksums - for name, extension in (('rootxz', '-root.tar.xz'), + for name, extension in (('disk1-img', '.img'), + ('rootxz', '-root.tar.xz'), ('squashfs', '.squashfs')): root = lxd.replace('-lxd.tar.xz', extension) combined = os.path.join(dirname, ','.join([lxd, root]))