Refresh patches for new upstream release

4 files changed, 6 insertions, 95 deletions

diff --git a/debian/changelog b/debian/changelog
index 09bea10..f9a8ee1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 scons (2.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches/remove_stale_files.patch:
+    - Refresh for new upstream release.
+  * debian/patches/manpages.patch:
+    - Removed, no longer needed.
   * debian/control:
     - Bump Standards-Version to 3.9.5, no changes required.
 
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
deleted file mode 100644
index a43189a..0000000
--- a/debian/patches/manpages.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Description: Fix spelling errors in the man pages
-Author: Luca Falavigna <dktrkranz@debian.org>
-
-Index: scons/scons-time.1
-===================================================================
---- scons.orig/scons-time.1	2013-03-11 22:26:44.957856419 +0100
-+++ scons/scons-time.1	2013-03-12 18:40:32.016953762 +0100
-@@ -198,7 +198,7 @@
- .B --number=
- option,
- and can be used to look at the
--impact of commited changes to the
-+impact of committed changes to the
- SCons code base on a particular
- configuration over time.
- .P
-@@ -645,7 +645,7 @@
- Specifies the run number to be used in the names of
- the log files and profile outputs generated by this run.
- .IP
--When used in conjuction with the
-+When used in conjunction with the
- .BI --aegis= PROJECT
- option,
- .I NUMBER
-@@ -653,7 +653,7 @@
- that will be retrieved automatically from the specified Aegis
- .IR PROJECT .
- .IP
--When used in conjuction with the
-+When used in conjunction with the
- .BI --svn= URL
- option,
- .I NUMBER
-Index: scons/scons.1
-===================================================================
---- scons.orig/scons.1	2013-03-11 22:26:44.957856419 +0100
-+++ scons/scons.1	2013-03-12 18:42:09.364956744 +0100
-@@ -2903,7 +2903,7 @@
- This builder method is only
- provided when Microsoft Visual C++ is being used as the compiler.
- The PCH builder method is generally used in
--conjuction with the PCH construction variable to force object files to use
-+conjunction with the PCH construction variable to force object files to use
- the precompiled header:
- 
- .ES
-@@ -3081,7 +3081,7 @@
- .I "Example 2."
- The \fBPOTUpdate\fP() builder may be used with no target specified, in which
- case default target \fBmessages.pot\fP will be used. The
--default target may also be overriden by setting \fB$POTDOMAIN\fP construction
-+default target may also be overridden by setting \fB$POTDOMAIN\fP construction
- variable or providing it as an override to \fBPOTUpdate\fP() builder:
- .ES    
-   # SConstruct script
-@@ -3189,7 +3189,7 @@
- (they're \fBIgnore\fPd from \fB'.'\fP node). Instead,
- they are added automatically to special \fBAlias\fP 
- (\fB'po-update'\fP by default). The alias name may be changed
--through the \fB$POUPDATE_ALIAS\fP construction variable.  You can easilly 
-+through the \fB$POUPDATE_ALIAS\fP construction variable.  You can easily
- update \fBPO\fP files in your project by \fBscons
- po-update\fP.
- 
-@@ -3858,7 +3858,7 @@
- \fBLINGUAS\fP file.  Note, that the updated
- \fBPOT\fP and \fBPO\fP files are usually going to be
- committed back to the repository, so they must be updated within the source
--directory (and not in variant directories). Additionaly, the file listing of
-+directory (and not in variant directories). Additionally, the file listing of
- \fBpo/\fP directory contains \fBLINGUAS\fP file,
- so the source tree looks familiar to translators, and they may work with the
- project in their usual way.
-@@ -5302,7 +5302,7 @@
- will print:
- 
- .ES
--'$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES'
-+\'$CC -c -o $TARGET $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $SOURCES'
- .EE
- .IP
- While this SConstruct:
-@@ -15403,7 +15403,7 @@
- tools, if they are both installed, regardless of the order of the bin
- directories in the PATH variable. If you have both MSVC and MinGW
- installed and you want to use MinGW instead of MSVC,
--then you must explictly tell SCons to use MinGW by passing
-+then you must explicitly tell SCons to use MinGW by passing
- 
- .ES
- tools=['mingw']
diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch
index 2c86153..1422d91 100644
--- a/debian/patches/remove_stale_files.patch
+++ b/debian/patches/remove_stale_files.patch
@@ -7,8 +7,8 @@ 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
-@@ -1073,6 +1073,21 @@
-         if not nodes:
+@@ -1087,6 +1087,21 @@
+             print 'Found nothing to build'
              exit_status = 2
  
 +        # Remove temporary files left by SCons
diff --git a/debian/patches/series b/debian/patches/series
index bb71714..ae600f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 java_ignore_nonexistent_files.patch
 remove_stale_files.patch
 parallel_build.patch
-manpages.patch