Refresh patches for new upstream release

3 files changed, 17 insertions, 17 deletions

diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch
index 5eb6a4a..c3bd606 100644
--- a/debian/patches/java_ignore_nonexistent_files.patch
+++ b/debian/patches/java_ignore_nonexistent_files.patch
@@ -3,10 +3,10 @@ Origin:		Debian
 Bug-Debian:	http://bugs.debian.org/338232
 Forwarded:	http://scons.tigris.org/issues/show_bug.cgi?id=2207
 
-Index: scons-1.1.0/engine/SCons/Tool/javac.py
+Index: b/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
+--- a/engine/SCons/Tool/javac.py	2010-01-23 15:11:20.016927869 +0100
++++ b/engine/SCons/Tool/javac.py	2010-01-23 15:11:33.892932280 +0100
 @@ -94,6 +94,8 @@
      version = env.get('JAVAVERSION', '1.4')
      full_tlist = []
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
index 68a5c0b..b3b4186 100644
--- a/debian/patches/manpages.patch
+++ b/debian/patches/manpages.patch
@@ -2,11 +2,11 @@ Description:    Fix errors in manpages
 Origin:         Debian
 Forwarded:      http://scons.tigris.org/issues/show_bug.cgi?id=2537
 
-Index: scons-1.2.0.d20091224/scons.1
+Index: b/scons.1
 ===================================================================
---- scons-1.2.0.d20091224.orig/scons.1	2009-12-29 13:03:28.105283822 +0100
-+++ scons-1.2.0.d20091224/scons.1	2009-12-29 13:01:50.725294000 +0100
-@@ -8994,7 +8994,7 @@
+--- a/scons.1	2010-01-23 15:11:19.240930120 +0100
++++ b/scons.1	2010-01-23 15:11:36.240935661 +0100
+@@ -9001,7 +9001,7 @@
  .IP FORTRANPPCOMSTR
  The string displayed when a Fortran source file
  is compiled to an object file
@@ -15,7 +15,7 @@ Index: scons-1.2.0.d20091224/scons.1
  If this is not set, then $FORTRANPPCOM
  (the command line) is displayed.
  
-@@ -9074,7 +9074,7 @@
+@@ -9081,7 +9081,7 @@
  general user-supplied frameworks options to be added at
  the end of a command
  line building a loadable module.
@@ -24,7 +24,7 @@ Index: scons-1.2.0.d20091224/scons.1
  the $FRAMEWORKPATH, $FRAMEWORKPATHPREFIX,
  $FRAMEWORKPREFIX and $FRAMEWORKS variables
  described above.)
-@@ -10348,7 +10348,7 @@
+@@ -10255,7 +10255,7 @@
  The prefix used for PostScript file names.
  
  .IP QT_AUTOSCAN
@@ -33,7 +33,7 @@ Index: scons-1.2.0.d20091224/scons.1
  specify files to run moc on.
  
  .IP QT_BINPATH
-@@ -10989,7 +10989,7 @@
+@@ -10896,7 +10896,7 @@
  .IP SHFORTRANPPCOMSTR
  The string displayed when a Fortran source file
  is compiled to a shared-library object file
@@ -42,7 +42,7 @@ Index: scons-1.2.0.d20091224/scons.1
  If this is not set, then $SHFORTRANPPCOM
  (the command line) is displayed.
  
-@@ -11003,7 +11003,7 @@
+@@ -10910,7 +10910,7 @@
  The linker for programs that use shared libraries.
  
  .IP SHLINKCOM
@@ -51,7 +51,7 @@ Index: scons-1.2.0.d20091224/scons.1
  
  .IP SHLINKCOMSTR
  The string displayed when programs using shared libraries are linked.
-@@ -11279,7 +11279,7 @@
+@@ -11190,7 +11190,7 @@
  used on other OSes as well.
  
  Valid values for Windows are 'x86', 'i386' (for 32 bits); 
@@ -60,7 +60,7 @@ Index: scons-1.2.0.d20091224/scons.1
  and 'ia64' (Itanium).
  For example, if you want to compile 64-bit binaries, you would set
  TARGET_ARCH='x86_64' in your SCons environment.
-@@ -11325,7 +11325,7 @@
+@@ -11236,7 +11236,7 @@
  General options passed to the TeX formatter and typesetter.
  
  .IP TEXINPUTS
diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch
index 39c0090..6083432 100644
--- a/debian/patches/remove_stale_files.patch
+++ b/debian/patches/remove_stale_files.patch
@@ -3,11 +3,11 @@ Origin:         Debian
 Bug-Debian:     http://bugs.debian.org/519948
 Forwarded:      http://scons.tigris.org/issues/show_bug.cgi?id=1571
 
-Index: scons-1.2.0.d20090905/engine/SCons/Script/Main.py
+Index: b/engine/SCons/Script/Main.py
 ===================================================================
---- scons-1.2.0.d20090905.orig/engine/SCons/Script/Main.py	2009-11-27 16:51:58.000000000 +0000
-+++ scons-1.2.0.d20090905/engine/SCons/Script/Main.py	2009-11-27 16:51:53.000000000 +0000
-@@ -1022,6 +1022,21 @@
+--- 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
+@@ -1025,6 +1025,21 @@
          if not nodes:
              exit_status = 2