diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0100-parallel_build.patch (renamed from debian/patches/parallel_build.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0105-java_ignore_nonexistent_files.patch (renamed from debian/patches/java_ignore_nonexistent_files.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0110-remove_stale_files.patch (renamed from debian/patches/remove_stale_files.patch) | 2 | ||||
| -rw-r--r-- | debian/patches/0115-secure_script_scons.patch (renamed from debian/patches/0020-secure_script_scons.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/manpage-spelling.patch | 45 | ||||
| -rw-r--r-- | debian/patches/scons-isystem.patch | 43 | ||||
| -rw-r--r-- | debian/patches/series | 10 |
8 files changed, 12 insertions, 95 deletions
diff --git a/debian/changelog b/debian/changelog index 19d1fc8..1a0c1ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (2.4.1-1) UNRELEASED; urgency=medium + + * New upstream version. + * Refresh and rename patches. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 16 Nov 2015 05:59:14 +0100 + scons (2.4.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/parallel_build.patch b/debian/patches/0100-parallel_build.patch index 3af9a90..3af9a90 100644 --- a/debian/patches/parallel_build.patch +++ b/debian/patches/0100-parallel_build.patch diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/0105-java_ignore_nonexistent_files.patch index 6cf704e..6cf704e 100644 --- a/debian/patches/java_ignore_nonexistent_files.patch +++ b/debian/patches/0105-java_ignore_nonexistent_files.patch diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index 6b59283..2c1273c 100644 --- a/debian/patches/remove_stale_files.patch +++ b/debian/patches/0110-remove_stale_files.patch @@ -7,7 +7,7 @@ Index: trunk/engine/SCons/Script/Main.py =================================================================== --- trunk.orig/engine/SCons/Script/Main.py +++ trunk/engine/SCons/Script/Main.py -@@ -1102,6 +1102,21 @@ def _main(parser): +@@ -1105,6 +1105,21 @@ def _main(parser): print 'Found nothing to build' exit_status = 2 diff --git a/debian/patches/0020-secure_script_scons.patch b/debian/patches/0115-secure_script_scons.patch index 7463f32..7463f32 100644 --- a/debian/patches/0020-secure_script_scons.patch +++ b/debian/patches/0115-secure_script_scons.patch diff --git a/debian/patches/manpage-spelling.patch b/debian/patches/manpage-spelling.patch deleted file mode 100644 index dc92ae7..0000000 --- a/debian/patches/manpage-spelling.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 -+++ trunk/scons.1 -@@ -4970,7 +4970,7 @@ env\&.Package( NAME = \*(Aqfoo - .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 -@@ -5307,7 +5307,7 @@ The - \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 -@@ -5522,7 +5522,7 @@ Alias - (\*(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\&. -@@ -6348,7 +6348,7 @@ file\&. Note, that the updated - 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/scons-isystem.patch b/debian/patches/scons-isystem.patch deleted file mode 100644 index d3b6b60..0000000 --- a/debian/patches/scons-isystem.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: add -isystem support to scons -Author: James McCoy <jamessan@debian.org> -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760804 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761565 -Forwarded: https://bitbucket.org/scons/scons/pull-request/184/support-isystem-in-parseflags/diff -Last-Update: 2014-09-16 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/scons.1 -=================================================================== ---- trunk.orig/scons.1 2014-09-16 07:55:07.618419159 +0200 -+++ trunk/scons.1 2014-09-16 07:55:07.550416614 +0200 -@@ -8549,6 +8549,7 @@ - \-framework FRAMEWORKS - \-frameworkdir= FRAMEWORKPATH - \-include CCFLAGS -+\-isystem CPPFLAGS - \-isysroot CCFLAGS, LINKFLAGS - \-I CPPPATH - \-l LIBS -Index: trunk/engine/SCons/Environment.py -=================================================================== ---- trunk.orig/engine/SCons/Environment.py 2014-09-15 20:30:32.000000000 +0200 -+++ trunk/engine/SCons/Environment.py 2014-09-16 07:57:55.260656356 +0200 -@@ -719,6 +719,9 @@ - t = ('-isysroot', arg) - dict['CCFLAGS'].append(t) - dict['LINKFLAGS'].append(t) -+ elif append_next_arg_to == '-isystem': -+ t = ('-isystem', arg) -+ dict['CCFLAGS'].append(t) - elif append_next_arg_to == '-arch': - t = ('-arch', arg) - dict['CCFLAGS'].append(t) -@@ -791,7 +794,7 @@ - elif arg[0] == '+': - dict['CCFLAGS'].append(arg) - dict['LINKFLAGS'].append(arg) -- elif arg in ['-include', '-isysroot', '-arch']: -+ elif arg in ['-include', '-isysroot', '-isystem', '-arch']: - append_next_arg_to = arg - else: - dict['CCFLAGS'].append(arg) diff --git a/debian/patches/series b/debian/patches/series index 815c651..80c1bfa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ -0020-secure_script_scons.patch -#manpage-spelling.patch -java_ignore_nonexistent_files.patch -remove_stale_files.patch -parallel_build.patch -#scons-isystem.patch +0115-secure_script_scons.patch +0105-java_ignore_nonexistent_files.patch +0110-remove_stale_files.patch +0100-parallel_build.patch |