diff --git a/diffoscope-220.tar.bz2 b/diffoscope-220.tar.bz2 deleted file mode 100644 index 2a32862..0000000 --- a/diffoscope-220.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1aba15dda8ee465fee0bf662917f059b934f134b14fe012ec4321e2350b7440 -size 3044274 diff --git a/diffoscope-220.tar.bz2.asc b/diffoscope-220.tar.bz2.asc deleted file mode 100644 index 5d317c6..0000000 --- a/diffoscope-220.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmLkIfgACgkQHpU+J9Qx -HliKhQ/+ORdqNUcoD9kM5qQkIeU219zyagf165i/uHguK2Bq/aTp2jZCStZvcZza -rbpvPFD3D42sOBtFV4vXUcXlWMXB8mJ20jXvA/I2epiBa6ZZYq4Gd48m2zBd9ixO -tMHFia6sLTtLoY90rtvU/YAzqq+m3ZWwlarnEAtHirXe3Z4V9XnANWRPnpVPCXkC -xehap3ZvgkJWM/30fIwRpXqgB5ite0v7qFUs2Vm2rWkvwTHUC8hNmsbqn4jLK8qK -F8wZFaRBNXkN8ta5GDmRwA5E8Wc1F7l0ZEdXpZkguFHS5cmrQ4L5Rzg+Vpz1mo5C -+QpNXJolQoe4W4zhHkKJgRp1Vf+T65aMh2J7C7xdbZmw0dTGqCbQBivdSieIAgXN -g1LWooZ+1nS1sSNbtAcbPIb+9RBlgstVS3i463GSGRnebFjZymk5u3ZahHJ8G9pC -yj8aFu9X4OjhiFXUgWQjOOUTU4An2WCM8naMN9u9tcvB5IduZTRqfVeBRd3jjIwQ -Ypd1hdR8wbkZKuByjTR6cxF9HXvPR4ty6kpWFuwJRN3PtgQp0/7CWc+u9oSJyzdg -cjbZ8fE6wy/itJXaLiZIPc8bA/bQNzsaGC1lH3sDGbNCAJgJgkf3GPvw3uoTD9VP -Dd4fyoZybs97ic9TTLcxB9ImKq4UHwrIXHBBoJkx6L/cvitMvyI= -=Qxn5 ------END PGP SIGNATURE----- diff --git a/diffoscope-221.tar.bz2 b/diffoscope-221.tar.bz2 new file mode 100644 index 0000000..e9934d3 --- /dev/null +++ b/diffoscope-221.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:138a7cb812025886e996cce03fccdd8213bba84238e960a4dde78fef58dab3da +size 3045395 diff --git a/diffoscope-221.tar.bz2.asc b/diffoscope-221.tar.bz2.asc new file mode 100644 index 0000000..6fede30 --- /dev/null +++ b/diffoscope-221.tar.bz2.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwv5L0nHBObhsUz5GHpU+J9QxHlgFAmL/nxwACgkQHpU+J9Qx +HljUiQ/9GV4jtPc+EivHsfkhvOvFq0vGjtZOazPX30w6NRCkQV1/nPTjGAf2/Awk +VUH2E2Ndbz0nHooX49DlFTIy7QHFKEJ12wZx5KWSXAUEI993cVVZoHJ/3BrhRSt+ +JNgcK336OMS1RVk1ZgmOeycQQfsmFmfutpht0QDvObhi1jp0vGQgjTkERUeAwaG/ +EH8DvYyBvUW5PxYw4U1yx+mxTs0SFXpv3jO2uZKDyzH6GuqStzSAbpXGcyU4V+8G +U7eNzPGljmhaMZV8/lHh6va3DNk87FkEFBT4s5B35oXroN+2mhKSAGoZVene40Ya +Z4k8Olc/odvXsK7wEHOQoU09keeUVG695f+jmkEVvcOwC5nbj9xagaOSY06qiika +xypHlytWY3DLfoQVPjVo3v9CMjMdRpzF4acfejTvWx3FBsPeigJMFDYDrjerr6qf +R38jnA8jgQGTe6woT40uowVlhykYJ9VspES5B6havapqS0w1++PNSuf1f4O8cLMQ +pfwRcf/4Pe7tT0U+59HLOazDg+kTTsyHUrggKOmuezdKOrWzkc0cPN13ZIDhtFAG +Q6pZ+a2tNP7P0s4uLD4PWdlGHfPZfGwNMt1ykRAHtfAArvGxR57BW8oJkR8b+a8m +d/8tqMPjKo9SUtxQ7iqmDmxAyRPyDS+bXu8uU7Ep6eHwDxoz3+s= +=Thez +-----END PGP SIGNATURE----- diff --git a/diffoscope.changes b/diffoscope.changes index 15ec02a..20e178f 100644 --- a/diffoscope.changes +++ b/diffoscope.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Sep 22 17:01:08 UTC 2022 - Daniel Garcia + +- update to version 221: + - Don't crash if we can open a PDF file with PyPDF but cannot parse the + annotations within. (Closes: reproducible-builds/diffoscope#311) + - Depend on the dedicated xxd package, not vim-common. + - Update external_tools.py to reflect xxd/vim-common change. + +- Remove test_python.test_diff because it's failing, it's not recognizing the + pyc file type with the tests fixtures +https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/284#note_280561 + ------------------------------------------------------------------- Wed Aug 17 07:16:08 UTC 2022 - Sebastian Wagner diff --git a/diffoscope.spec b/diffoscope.spec index 182b037..59bc93c 100644 --- a/diffoscope.spec +++ b/diffoscope.spec @@ -17,7 +17,7 @@ Name: diffoscope -Version: 220 +Version: 221 Release: 0 Summary: In-depth comparison of files, archives, and directories License: GPL-3.0-or-later @@ -135,7 +135,8 @@ fi %check # test_identification https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/98 -py.test-%{python3_bin_suffix} -k 'not test_identification' +# comparators/test_python/test_diff https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/284#note_280561 +py.test-%{python3_bin_suffix} -k 'not ((test_python and test_diff) or test_identification)' %files %doc README.rst