last 2.3.2-1

5 files changed, 139 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..5ba4713
--- /dev/null
+++ b/debian/patches/java_ignore_nonexistent_files.patch
@@ -0,0 +1,21 @@
+Description:	Ignore nonexistent files before trying to use them in Java()
+Origin:		Debian
+Bug-Debian:	http://bugs.debian.org/338232
+Forwarded:	http://scons.tigris.org/issues/show_bug.cgi?id=2207
+
+Index: scons/engine/SCons/Tool/JavaCommon.py
+===================================================================
+--- scons.orig/engine/SCons/Tool/JavaCommon.py	2013-03-23 03:19:25.394200546 +0100
++++ scons/engine/SCons/Tool/JavaCommon.py	2013-03-23 03:28:01.158216345 +0100
+@@ -282,7 +282,10 @@
+             return self.outer_state
+ 
+     def parse_java_file(fn, version=default_java_version):
+-        return parse_java(open(fn, 'r').read(), version)
++        try:
++            return parse_java(open(fn, 'r').read(), version)
++        except IOError:
++            return (None, [])
+ 
+     def parse_java(contents, version=default_java_version, trace=None):
+         """Parse a .java file and return a double of package directory,
diff --git a/debian/patches/manpage-spelling.patch b/debian/patches/manpage-spelling.patch
new file mode 100644
index 0000000..6e747c6
--- /dev/null
+++ b/debian/patches/manpage-spelling.patch
@@ -0,0 +1,45 @@
+Description: typo in man-page
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-07-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/scons.1
+===================================================================
+--- trunk.orig/scons.1	2014-07-05 15:43:01.000000000 +0200
++++ trunk/scons.1	2014-07-26 11:01:37.827396555 +0200
+@@ -4973,7 +4973,7 @@
+ .PP
+ \fBPCH()\fR, \fBenv\&.PCH()\fR
+ .RS 4
+-Builds a Microsoft Visual C++ precompiled header\&. Calling this builder method returns a list of two targets: the PCH as the first element, and the object file as the second element\&. Normally the object file is ignored\&. 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 the precompiled header:
++Builds a Microsoft Visual C++ precompiled header\&. Calling this builder method returns a list of two targets: the PCH as the first element, and the object file as the second element\&. Normally the object file is ignored\&. This builder method is only provided when Microsoft Visual C++ is being used as the compiler\&. The PCH builder method is generally used in conjunction with the PCH construction variable to force object files to use the precompiled header:
+ .sp
+ .if n \{\
+ .RS 4
+@@ -5310,7 +5310,7 @@
+ \fBPOTUpdate\fR
+ builder may be used with no target specified, in which case default target
+ messages\&.pot
+-will be used\&. The default target may also be overriden by setting
++will be used\&. The default target may also be overridden by setting
+ \fB$POTDOMAIN\fR
+ construction variable or providing it as an override to
+ \fBPOTUpdate\fR
+@@ -5525,7 +5525,7 @@
+ (\*(Aqpo\-update\*(Aq
+ by default)\&. The alias name may be changed through the
+ \fB$POUPDATE_ALIAS\fR
+-construction variable\&. You can easilly update
++construction variable\&. You can easily update
+ PO
+ files in your project by
+ \fBscons po\-update\fR\&.
+@@ -6351,7 +6351,7 @@
+ POT
+ and
+ PO
+-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
++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)\&. Additionally, the file listing of
+ po/
+ directory contains
+ LINGUAS
diff --git a/debian/patches/parallel_build.patch b/debian/patches/parallel_build.patch
new file mode 100644
index 0000000..3af9a90
--- /dev/null
+++ b/debian/patches/parallel_build.patch
@@ -0,0 +1,38 @@
+Description:    Disable parallel build on sparc machines
+Origin:         Debian
+Bug-Debian:     http://bugs.debian.org/632228
+Forwarded:      no
+
+Index: scons/engine/SCons/Job.py
+===================================================================
+--- scons.orig/engine/SCons/Job.py	2011-07-02 13:09:20.281651892 +0200
++++ scons/engine/SCons/Job.py	2011-07-02 13:12:49.925651735 +0200
+@@ -83,7 +83,7 @@
+         """
+ 
+         self.job = None
+-        if num > 1:
++        if num > 1 and not self._check_sparc_machine():
+             stack_size = explicit_stack_size
+             if stack_size is None:
+                 stack_size = default_stack_size
+@@ -163,6 +163,19 @@
+         except AttributeError:
+             pass
+ 
++    def _check_sparc_machine(self):
++        """ Check whether machine is sparc"""
++        try:
++            from platform import machine
++        except ImportError:
++            pass
++        else:
++            if 'sparc' in machine():
++                SCons.Warnings.warn(SCons.Warnings.StackSizeWarning,
++                                    'Parallel build disabled on sparc, '
++                                    'see Debian bug #632228')
++                return True
++
+ class Serial(object):
+     """This class is used to execute tasks in series, and is more efficient
+     than Parallel, but is only appropriate for non-parallel builds. Only
diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch
new file mode 100644
index 0000000..1422d91
--- /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
+@@ -1087,6 +1087,21 @@
+             print 'Found nothing to build'
+             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..4e0fa14
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+manpage-spelling.patch
+java_ignore_nonexistent_files.patch
+remove_stale_files.patch
+parallel_build.patch