Remove manpages.patch, applied upstream

3 files changed, 3 insertions, 73 deletions

diff --git a/debian/changelog b/debian/changelog
index 3a107de..d305b83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 scons (1.2.0.d20100306-1) UNRELEASED; urgency=low
 
   * New upstream checkpoint release.
+  * debian/patches/manpages.patch:
+    - Removed, applied upstream.
 
- -- Luca Falavigna <dktrkranz@debian.org>  Wed, 10 Mar 2010 13:49:56 +0100
+ -- Luca Falavigna <dktrkranz@debian.org>  Wed, 10 Mar 2010 13:55:41 +0100
 
 scons (1.2.0.d20100117-1) unstable; urgency=low
 
diff --git a/debian/patches/manpages.patch b/debian/patches/manpages.patch
deleted file mode 100644
index b3b4186..0000000
--- a/debian/patches/manpages.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description:    Fix errors in manpages
-Origin:         Debian
-Forwarded:      http://scons.tigris.org/issues/show_bug.cgi?id=2537
-
-Index: b/scons.1
-===================================================================
---- 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
--after first running the file throught the C preprocessor.
-+after first running the file through the C preprocessor.
- If this is not set, then $FORTRANPPCOM
- (the command line) is displayed.
- 
-@@ -9081,7 +9081,7 @@
- general user-supplied frameworks options to be added at
- the end of a command
- line building a loadable module.
--(This has been largely superceded by
-+(This has been largely superseded by
- the $FRAMEWORKPATH, $FRAMEWORKPATHPREFIX,
- $FRAMEWORKPREFIX and $FRAMEWORKS variables
- described above.)
-@@ -10255,7 +10255,7 @@
- The prefix used for PostScript file names.
- 
- .IP QT_AUTOSCAN
--Turn off scanning for mocable files. Use the Moc Builder to explicitely
-+Turn off scanning for mocable files. Use the Moc Builder to explicitly
- specify files to run moc on.
- 
- .IP QT_BINPATH
-@@ -10896,7 +10896,7 @@
- .IP SHFORTRANPPCOMSTR
- The string displayed when a Fortran source file
- is compiled to a shared-library object file
--after first running the file throught the C preprocessor.
-+after first running the file through the C preprocessor.
- If this is not set, then $SHFORTRANPPCOM
- (the command line) is displayed.
- 
-@@ -10910,7 +10910,7 @@
- The linker for programs that use shared libraries.
- 
- .IP SHLINKCOM
--The command line used to link programs using shared libaries.
-+The command line used to link programs using shared libraries.
- 
- .IP SHLINKCOMSTR
- The string displayed when programs using shared libraries are linked.
-@@ -11190,7 +11190,7 @@
- used on other OSes as well.
- 
- Valid values for Windows are 'x86', 'i386' (for 32 bits); 
--'amd64', 'emt64', 'x86_64' (64 bits);
-+\&'amd64', 'emt64', 'x86_64' (64 bits);
- and 'ia64' (Itanium).
- For example, if you want to compile 64-bit binaries, you would set
- TARGET_ARCH='x86_64' in your SCons environment.
-@@ -11236,7 +11236,7 @@
- General options passed to the TeX formatter and typesetter.
- 
- .IP TEXINPUTS
--List of directories that the LaTeX programm will search
-+List of directories that the LaTeX program will search
- for include directories.
- The LaTeX implicit dependency scanner will search these
- directories for \\include and \\import files.
diff --git a/debian/patches/series b/debian/patches/series
index 495e8c0..4dc5402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 java_ignore_nonexistent_files.patch
 remove_stale_files.patch
-manpages.patch