4 files changed, 56 insertions, 0 deletions
diff --git a/debian/patches/java_ignore_nonexistent_files b/debian/patches/java_ignore_nonexistent_files
new file mode 100644
index 0000000..123b72c
--- /dev/null
+++ b/debian/patches/java_ignore_nonexistent_files
@@ -0,0 +1,17 @@
+Description:	Check for file/symlink existence before trying to use it in Java().
+Upstream bug:	http://scons.tigris.org/issues/show_bug.cgi?id=2207
+Debian bug:	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338232
+
+Index: scons-1.1.0/engine/SCons/Tool/javac.py
+===================================================================
+--- scons-1.1.0.orig/engine/SCons/Tool/javac.py	2008-10-11 18:11:46.083270910 +0200
++++ scons-1.1.0/engine/SCons/Tool/javac.py	2008-10-11 18:13:04.519739110 +0200
+@@ -94,6 +94,8 @@
+     version = env.get('JAVAVERSION', '1.4')
+     full_tlist = []
+     for f in slist:
++        if not os.path.exists(f.rfile().get_abspath()):
++            continue
+         tlist = []
+         source_file_based = True
+         pkg_dir = None
diff --git a/debian/patches/no_commandline_arguments b/debian/patches/no_commandline_arguments
new file mode 100644
index 0000000..a5be27c
--- /dev/null
+++ b/debian/patches/no_commandline_arguments
@@ -0,0 +1,17 @@
+Description:    Fix an exception when a null command-line argument is passed in.
+Upstream bug:   http://scons.tigris.org/issues/show_bug.cgi?id=2368
+Ubuntu bug:     https://launchpad.net/bugs/338492
+
+Index: scons-1.2.0/engine/SCons/Script/Main.py
+===================================================================
+--- scons-1.2.0.orig/engine/SCons/Script/Main.py	2009-03-06 08:13:35.000000000 +0000
++++ scons-1.2.0/engine/SCons/Script/Main.py	2009-03-06 08:13:57.000000000 +0000
+@@ -869,7 +869,7 @@
+     targets = []
+     xmit_args = []
+     for a in parser.largs:
+-        if a[0] == '-':
++        if a[:1] == '-':
+             continue
+         if '=' in a:
+             xmit_args.append(a)
diff --git a/debian/patches/remove_broken_symlinks b/debian/patches/remove_broken_symlinks
new file mode 100644
index 0000000..f28a4d7
--- /dev/null
+++ b/debian/patches/remove_broken_symlinks
@@ -0,0 +1,19 @@
+Description:	In Clean() routine, try to delete symlinks even if files they point to are not available.
+Upstream bug:	http://scons.tigris.org/issues/show_bug.cgi?id=2095
+Debian bug:	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485521
+
+Index: scons-1.2.0/engine/SCons/Script/Main.py
+===================================================================
+--- scons-1.2.0.orig/engine/SCons/Script/Main.py	2008-12-26 17:46:29.470044569 +0100
++++ scons-1.2.0/engine/SCons/Script/Main.py	2008-12-26 17:46:40.238042348 +0100
+@@ -328,6 +328,10 @@
+                     # then delete dir itself
+                     if remove: os.rmdir(path)
+                     display("Removed directory " + pathstr)
++            else:
++                if os.path.islink(path):
++                    if remove: os.unlink(path)
++                    display("Removed " + pathstr)
+         except (IOError, OSError), e:
+             print "scons: Could not remove '%s':" % pathstr, e.strerror
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..db145e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+java_ignore_nonexistent_files
+remove_broken_symlinks
+no_commandline_arguments