diff -u scons-0.98.5/debian/changelog scons-0.98.5/debian/changelog
--- scons-0.98.5/debian/changelog
+++ scons-0.98.5/debian/changelog
@@ -1,3 +1,12 @@
+scons (0.98.5-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable (LP: #226783), remaining Ubuntu changes:
+    + debian/patches/ubuntu_buildds_spawn:
+      - Don't use os.system()+env to spawn tools, working around
+        underquoting of the environment.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Wed, 11 Jun 2008 17:04:10 +0200
+
 scons (0.98.5-1) unstable; urgency=low
 
   * New upstream release.
@@ -105,6 +114,16 @@
 
  -- Mark Brown <broonie@debian.org>  Fri, 14 Dec 2007 20:22:42 +0000
 
+scons (0.97.0d20071203-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Don't use os.system()+env to spawn tools, working around underquoting of
+      the environment until a real fix is done upstream.
+    - debian/control: Modify Maintainer value to match
+      DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 08 Dec 2007 20:01:12 +0100
+
 scons (0.97.0d20071203-1) unstable; urgency=low
 
   * Unofficial upstream snapshot (SVN revision 2509).
@@ -124,6 +143,18 @@
 
  -- Mark Brown <broonie@debian.org>  Sat, 11 Aug 2007 00:06:27 +0100
 
+scons (0.97-1ubuntu1) gutsy; urgency=low
+
+  [ Mark Brown ]
+  * Don't use os.system()+env to spawn tools, working around underquoting
+    of the environment until a real fix is done upstream (LP: #87077).
+
+  [ Michael Bienia ]
+  * debian/control: Modify Maintainer value to match
+    DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 21 Jul 2007 01:20:19 +0200
+
 scons (0.97-1) unstable; urgency=low
 
   * New upstream release.
diff -u scons-0.98.5/debian/patches/series scons-0.98.5/debian/patches/series
--- scons-0.98.5/debian/patches/series
+++ scons-0.98.5/debian/patches/series
@@ -2,0 +3 @@
+ubuntu_buildds_spawn
only in patch2:
unchanged:
--- scons-0.98.5.orig/debian/patches/ubuntu_buildds_spawn
+++ scons-0.98.5/debian/patches/ubuntu_buildds_spawn
@@ -0,0 +1,21 @@
+Index: scons-0.98.4-1/engine/SCons/Platform/posix.py
+===================================================================
+--- scons-0.98.4-1.orig/engine/SCons/Platform/posix.py	2008-05-28 09:27:07.000000000 +0200
++++ scons-0.98.4-1/engine/SCons/Platform/posix.py	2008-05-28 09:27:35.000000000 +0200
+@@ -217,15 +217,10 @@
+ 
+     if os.__dict__.has_key('spawnvpe'):
+         spawn = spawnvpe_spawn
+-    elif env.Detect('env'):
+-        spawn = env_spawn
+     else:
+         spawn = fork_spawn
+ 
+-    if env.Detect('env'):
+-        pspawn = piped_env_spawn
+-    else:
+-        pspawn = piped_fork_spawn
++    pspawn = piped_fork_spawn
+ 
+     if not env.has_key('ENV'):
+         env['ENV']        = {}