From e627d1d01f36a1c4935978861db6e46b77167f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 20:06:47 +0200 Subject: Refresh d/p/0110-remove_stale_files.patch for python 3 compatibility --- debian/changelog | 7 +++++++ debian/files | 1 - debian/patches/0110-remove_stale_files.patch | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index 0d0c874..be64e6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (3.0.1-2) UNRELEASED; urgency=medium + + * Refresh debian/patches/0110-remove_stale_files.patch to + make fix python 3 compatibility (Closes: #893740). + + -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 + scons (3.0.1-1) unstable; urgency=medium * New upstream release: diff --git a/debian/files b/debian/files deleted file mode 100644 index 59a90df..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -scons_3.0.1-1_source.buildinfo devel optional diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index b3a94d2..298d47c 100644 --- a/debian/patches/0110-remove_stale_files.patch +++ b/debian/patches/0110-remove_stale_files.patch @@ -13,7 +13,7 @@ Index: trunk/engine/SCons/Script/Main.py + # Remove temporary files left by SCons + if options.clean: -+ if os.environ.has_key('DH_INTERNAL_OPTIONS'): ++ if 'DH_INTERNAL_OPTIONS' in os.environ: + import shutil + for path in ('.sconsign.dblite', '.sconf_temp'): + try: -- cgit v1.2.3