diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/java_ignore_nonexistent_files.patch | 18 | ||||
| -rw-r--r-- | debian/patches/manpages.patch | 71 | ||||
| -rw-r--r-- | debian/patches/remove_stale_files.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 123 insertions, 0 deletions
diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..c3bd606 --- /dev/null +++ b/debian/patches/java_ignore_nonexistent_files.patch @@ -0,0 +1,18 @@ +Description: Check for file/symlink existence before trying to use it in Java() +Origin: Debian +Bug-Debian: http://bugs.debian.org/338232 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2207 + +Index: b/engine/SCons/Tool/javac.py +=================================================================== +--- 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 = [] + 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/manpages.patch b/debian/patches/manpages.patch new file mode 100644 index 0000000..b3b4186 --- /dev/null +++ b/debian/patches/manpages.patch @@ -0,0 +1,71 @@ +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/remove_stale_files.patch b/debian/patches/remove_stale_files.patch new file mode 100644 index 0000000..6083432 --- /dev/null +++ b/debian/patches/remove_stale_files.patch @@ -0,0 +1,31 @@ +Description: Remove stale files created by SCons when building Debian packages +Origin: Debian +Bug-Debian: http://bugs.debian.org/519948 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=1571 + +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 +@@ -1025,6 +1025,21 @@ + if not nodes: + exit_status = 2 + ++ # Remove temporary files left by SCons ++ if options.clean: ++ if os.environ.has_key('DH_INTERNAL_OPTIONS'): ++ import shutil ++ for path in ('.sconsign.dblite', '.sconf_temp'): ++ try: ++ if os.path.isfile(path): ++ print 'Removing autogenerated file %s' % path ++ os.remove(path) ++ if os.path.isdir(path): ++ print 'Removing autogenerated directory %s' % path ++ shutil.rmtree(path) ++ except OSError: ++ pass ++ + def _build_targets(fs, options, targets, target_top): + + global this_build_status diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..495e8c0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +java_ignore_nonexistent_files.patch +remove_stale_files.patch +manpages.patch |