From 1a27ae6f3d1e41ddb67db33a2874b564d747f15e Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sat, 5 Dec 2009 18:16:34 +0100 Subject: Check for DH_INTERNAL_OPTIONS instead --- debian/changelog | 2 +- debian/patches/remove_stale_files.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0fae51..f63a155 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ scons (1.2.0.d20090919-1) UNRELEASED; urgency=low * New upstream checkpoint release. * debian/patches/remove_stale_files.patch: - Remove stale files created by SCons when building Debian packages. - Check if DEB_BUILD_ARCH_OS is set, then delete selected files. This + Check if DH_INTERNAL_OPTIONS is set, then delete selected files. This is a workaround to fix double compilation, it will reverted when upstream implements support for deep clean (Closes: #519948). * debian/patches/manpages.patch: diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch index 9d776f0..39c0090 100644 --- a/debian/patches/remove_stale_files.patch +++ b/debian/patches/remove_stale_files.patch @@ -13,7 +13,7 @@ Index: scons-1.2.0.d20090905/engine/SCons/Script/Main.py + # Remove temporary files left by SCons + if options.clean: -+ if os.getenv('DEB_BUILD_ARCH_OS'): ++ if os.environ.has_key('DH_INTERNAL_OPTIONS'): + import shutil + for path in ('.sconsign.dblite', '.sconf_temp'): + try: -- cgit v1.2.3