diff -Nru python-cutadapt-3.2/debian/changelog python-cutadapt-3.2/debian/changelog --- python-cutadapt-3.2/debian/changelog 2021-01-09 11:11:47.000000000 +0000 +++ python-cutadapt-3.2/debian/changelog 2021-01-30 10:38:08.000000000 +0000 @@ -1,3 +1,12 @@ +python-cutadapt (3.2-2) unstable; urgency=medium + + * Team upload. + * Build i386 architecture with -ffloat-store to address failing tests. + * Add skip-setuptools-scm.patch to avoid accessing network resources during + builds and cleanup, and added supplement to the d/rules clean target. + + -- Étienne Mollier Sat, 30 Jan 2021 11:38:08 +0100 + python-cutadapt (3.2-1) unstable; urgency=medium * New upstream version diff -Nru python-cutadapt-3.2/debian/patches/series python-cutadapt-3.2/debian/patches/series --- python-cutadapt-3.2/debian/patches/series 2021-01-09 11:04:57.000000000 +0000 +++ python-cutadapt-3.2/debian/patches/series 2021-01-30 10:26:45.000000000 +0000 @@ -1 +1,2 @@ xfail_cutadapt_executable_test.patch +skip-setuptools-scm.patch diff -Nru python-cutadapt-3.2/debian/patches/skip-setuptools-scm.patch python-cutadapt-3.2/debian/patches/skip-setuptools-scm.patch --- python-cutadapt-3.2/debian/patches/skip-setuptools-scm.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-cutadapt-3.2/debian/patches/skip-setuptools-scm.patch 2021-01-30 10:35:01.000000000 +0000 @@ -0,0 +1,18 @@ +Description: skip setuptools-scm + The setuptools-scm tries to access to ressources on the network. This patch + removes the component off the setup.py +Author: Étienne Mollier +Forwarded: not-needed +Last-Update: 2021-01-30 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- python-cutadapt.orig/setup.py ++++ python-cutadapt/setup.py +@@ -85,7 +85,6 @@ + + setup( + name='cutadapt', +- setup_requires=['setuptools_scm'], # Support pip versions that don't know about pyproject.toml + use_scm_version={'write_to': 'src/cutadapt/_version.py'}, + author='Marcel Martin', + author_email='marcel.martin@scilifelab.se', diff -Nru python-cutadapt-3.2/debian/rules python-cutadapt-3.2/debian/rules --- python-cutadapt-3.2/debian/rules 2021-01-09 11:11:45.000000000 +0000 +++ python-cutadapt-3.2/debian/rules 2021-01-30 10:33:26.000000000 +0000 @@ -3,18 +3,15 @@ # output every command that modifies files on the build system. #export DH_VERBOSE = 1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifneq (,$(filter $(DEB_BUILD_ARCH),i386)) +export DEB_CFLAGS_MAINT_APPEND += -ffloat-store +endif + # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - export PYBUILD_NAME=cutadapt %: @@ -34,5 +31,6 @@ dh_auto_clean rm -rf src/cutadapt.egg-info/ .pytest_cache rm -f src/cutadapt/_version.py + rm -rf .eggs # cython-generated files rm -f src/cutadapt/_align.c src/cutadapt/qualtrim.c