Refresh and rename patches

1 files changed, 31 insertions, 0 deletions

diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch
new file mode 100644
index 0000000..2c1273c
--- /dev/null
+++ b/debian/patches/0110-remove_stale_files.patch
@@ -0,0 +1,31 @@
+Description:    Remove stale files created by SCons when building Debian packages
+Origin:         Debian
+Bug-Debian:     http://bugs.debian.org/519948
+Forwarded:      http://scons.tigris.org/issues/show_bug.cgi?id=1571
+
+Index: trunk/engine/SCons/Script/Main.py
+===================================================================
+--- trunk.orig/engine/SCons/Script/Main.py
++++ trunk/engine/SCons/Script/Main.py
+@@ -1105,6 +1105,21 @@ def _main(parser):
+             print 'Found nothing to build'
+             exit_status = 2
+ 
++        # Remove temporary files left by SCons
++        if options.clean:
++            if os.environ.has_key('DH_INTERNAL_OPTIONS'):
++                import shutil
++                for path in ('.sconsign.dblite', '.sconf_temp'):
++                    try:
++                        if os.path.isfile(path):
++                            print 'Removing autogenerated file %s' % path
++                            os.remove(path)
++                        if os.path.isdir(path):
++                            print 'Removing autogenerated directory %s' % path
++                            shutil.rmtree(path)
++                    except OSError:
++                        pass
++
+ def _build_targets(fs, options, targets, target_top):
+ 
+     global this_build_status