diff -Nru zfs-fuse-0.7.0/debian/changelog zfs-fuse-0.7.0/debian/changelog --- zfs-fuse-0.7.0/debian/changelog 2019-09-05 11:17:45.000000000 +0000 +++ zfs-fuse-0.7.0/debian/changelog 2020-01-04 15:38:32.000000000 +0000 @@ -1,8 +1,9 @@ -zfs-fuse (0.7.0-19build1) eoan; urgency=medium +zfs-fuse (0.7.0-20) unstable; urgency=medium - * No-change upload with strops.h and sys/strops.h removed in glibc. + * QA upload. + * Add patch from Phil Wyett to fix build with Python3 scons. Closes: #947588 - -- Matthias Klose Thu, 05 Sep 2019 11:17:45 +0000 + -- Mattia Rizzolo Sat, 04 Jan 2020 16:38:32 +0100 zfs-fuse (0.7.0-19) unstable; urgency=medium diff -Nru zfs-fuse-0.7.0/debian/patches/fix-scons-use-python3-print.patch zfs-fuse-0.7.0/debian/patches/fix-scons-use-python3-print.patch --- zfs-fuse-0.7.0/debian/patches/fix-scons-use-python3-print.patch 1970-01-01 00:00:00.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/fix-scons-use-python3-print.patch 2020-01-04 15:36:50.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Use python3 print() +Author: Phil Wyett +Last-Update: 2019-12-29 +Bug-Debian: https://bugs.debian.org/947588 + +--- zfs-fuse-0.7.0.orig/src/SConstruct ++++ zfs-fuse-0.7.0/src/SConstruct +@@ -56,8 +56,8 @@ else: + + if not (('-DDEBUG' in env['CCFLAGS']) or + ('-DNDEBUG' in env['CCFLAGS'])): +- print +- print "Misconfigured debug level: Neither DEBUG or NDEBUG appears to have been defined: %s" % env['CCFLAGS'] ++ print () ++ print ("Misconfigured debug level: Neither DEBUG or NDEBUG appears to have been defined: %s") % env['CCFLAGS'] + sys.exit(1) + + env['CPPPATH'] = [] +@@ -81,8 +81,8 @@ def getarch(arch): + myarch = getarch(arch) + + if not myarch: +- print +- print 'Sorry, only the x86, amd64 and sparc64 hardware architectures are supported' ++ print () ++ print ('Sorry, only the x86, amd64 and sparc64 hardware architectures are supported') + sys.exit(1) + + if myarch == 'sparc64': +@@ -129,7 +129,7 @@ env.Install(man_dir, '../doc/zstreamdump + env.Install(man_dir, '../doc/zfs-fuse.8') + + if "tags" in sys.argv: +- print "updating tags..." ++ print ("updating tags...") + os.system("ctags --extra=+f `find -name '*.c'` `find -name '*.h'`") + + env.Alias('install', [install_dir, man_dir, cfg_dir]) diff -Nru zfs-fuse-0.7.0/debian/patches/series zfs-fuse-0.7.0/debian/patches/series --- zfs-fuse-0.7.0/debian/patches/series 2018-12-17 16:48:52.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/series 2020-01-04 15:37:00.000000000 +0000 @@ -17,3 +17,4 @@ zfs-list-snapshots-fix.patch sparc64.patch add-missing-includes.patch +fix-scons-use-python3-print.patch