summaryrefslogtreecommitdiff
path: root/debian/patches/remove_stale_files.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <jff@merkur>2014-07-26 11:45:48 +0200
committerJörg Frings-Fürst <jff@merkur>2014-07-26 11:45:48 +0200
commit99469e37d07b9f326c5b2c8157566f2f512cdc56 (patch)
tree475c0ae1b3b3b8be085b54420894896688ea363c /debian/patches/remove_stale_files.patch
parent2176ae74d2f856582dd1e498a63a31949a7e19e2 (diff)
parent7c6b954c00c2a2eed2e975ec797216c515cd249d (diff)
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
Diffstat (limited to 'debian/patches/remove_stale_files.patch')
-rw-r--r--debian/patches/remove_stale_files.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch
deleted file mode 100644
index 1422d91..0000000
--- a/debian/patches/remove_stale_files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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: b/engine/SCons/Script/Main.py
-===================================================================
---- a/engine/SCons/Script/Main.py 2010-01-23 15:11:19.624932557 +0100
-+++ b/engine/SCons/Script/Main.py 2010-01-23 15:11:35.084931903 +0100
-@@ -1087,6 +1087,21 @@
- 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