diff -Nru duplicity-1.2.2/debian/changelog duplicity-1.2.2/debian/changelog --- duplicity-1.2.2/debian/changelog 2023-04-09 06:26:53.000000000 +0000 +++ duplicity-1.2.2/debian/changelog 2023-09-15 07:23:08.000000000 +0000 @@ -1,3 +1,12 @@ +duplicity (1.2.2-1ubuntu1) mantic; urgency=medium + + * Fix failure to build from source with new setuptools (LP: #2035603): + - d/p/08-packages: test.overrides{,.bin} are specified as separate + packages so their files are correctly included. + - d/rules: Cherry pick missing files and remove unwanted locale ones. + + -- Nathan Pratta Teodosio Fri, 15 Sep 2023 09:23:08 +0200 + duplicity (1.2.2-1) unstable; urgency=medium * new upstream release (closes: #817042, #565398, #801210, #880111) diff -Nru duplicity-1.2.2/debian/control duplicity-1.2.2/debian/control --- duplicity-1.2.2/debian/control 2023-04-09 00:36:41.000000000 +0000 +++ duplicity-1.2.2/debian/control 2023-09-14 08:33:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: duplicity Section: utils Priority: optional -Maintainer: Alexander Zangerl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Alexander Zangerl Build-Depends: debhelper-compat (= 13), python3-all-dev, dh-python, python3-setuptools, gnupg | gnupg1, diff -Nru duplicity-1.2.2/debian/patches/08-packages duplicity-1.2.2/debian/patches/08-packages --- duplicity-1.2.2/debian/patches/08-packages 1970-01-01 00:00:00.000000000 +0000 +++ duplicity-1.2.2/debian/patches/08-packages 2023-09-14 08:33:17.000000000 +0000 @@ -0,0 +1,27 @@ +--- duplicity-1.2.2.orig/setup.py ++++ duplicity-1.2.2/setup.py +@@ -305,6 +305,8 @@ setup(name=u"duplicity", + u"testing", + u"testing.functional", + u"testing.unit", ++ u"testing.overrides.bin", ++ u"testing.overrides", + ], + package_dir={ + u"duplicity": u"duplicity", +@@ -328,15 +330,6 @@ setup(name=u"duplicity", + u"testing/gnupg/random_seed", + u"testing/gnupg/secring.gpg", + u"testing/gnupg/trustdb.gpg", +- u"testing/overrides", +- u"testing/overrides/__init__.py", +- u"testing/overrides/bin", +- u"testing/overrides/bin/hsi", +- u"testing/overrides/bin/lftp", +- u"testing/overrides/bin/ncftpget", +- u"testing/overrides/bin/ncftpls", +- u"testing/overrides/bin/ncftpput", +- u"testing/overrides/bin/tahoe", + ], + }, + ext_modules=ext_modules, diff -Nru duplicity-1.2.2/debian/patches/series duplicity-1.2.2/debian/patches/series --- duplicity-1.2.2/debian/patches/series 2023-04-08 09:01:34.000000000 +0000 +++ duplicity-1.2.2/debian/patches/series 2023-09-14 08:33:17.000000000 +0000 @@ -3,3 +3,4 @@ 05-testsuite 06-noenv 07-giobackend +08-packages diff -Nru duplicity-1.2.2/debian/rules duplicity-1.2.2/debian/rules --- duplicity-1.2.2/debian/rules 2023-04-09 06:06:03.000000000 +0000 +++ duplicity-1.2.2/debian/rules 2023-09-14 08:33:17.000000000 +0000 @@ -26,9 +26,11 @@ rm -r --verbose debian/duplicity/usr/share/doc/duplicity-* (cd debian/duplicity/usr \ && mkdir -p share/doc/duplicity \ - && mv --verbose \ - lib/python*/dist-packages/duplicity/backends/README \ + && cp --verbose \ + ../../../duplicity/backends/README \ share/doc/duplicity/README.backends) + cp duplicity/_librsyncmodule.c debian/duplicity//usr/lib/python3.11/dist-packages/duplicity + rm -rf debian/duplicity/usr/share/locale execute_after_dh_clean: # the test suite leaves a mess behind