summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 10:40:01 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 10:40:01 +0200
commit9ddba95984d3c5bcc02deb636244cac8f1fd686f (patch)
tree7a7320243f8d6b0266ebce66693b0c717525de07 /debian
parentb2fa39f7baf24a9da2ee40e6d625e8ce91c4b471 (diff)
UNRELEASED 2.3.3-1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/control4
-rw-r--r--debian/patches/scons-isystem.diff43
-rw-r--r--debian/patches/series1
4 files changed, 51 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 20d85ca..e6d2a5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-scons (2.3.2-1) unstable; urgency=medium
+scons (2.3.3-1) UNRELEASED; urgency=medium
* New maintainer (closes: #755496).
* New upstream release
@@ -17,8 +17,11 @@ scons (2.3.2-1) unstable; urgency=medium
- Rewrite regex for finding all file extensions.
* Add debian/source/options:
- Set compression to xz & compression-level to 9 to save space.
+ * Add debian/patch/scons-isystem.diff (Closes: #760804, #761565)
+ - add -isystem support to scons
+ Thanks to James McCoy <jamessan@debian.org>
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 31 Jul 2014 21:24:12 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 16 Sep 2014 08:02:04 +0200
scons (2.3.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index b92634b..92ce26e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: scons
Section: devel
Priority: optional
Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Build-Depends:
- debhelper (>= 9),
+Build-Depends:
+ debhelper (>= 9),
python (>= 2.7~)
Standards-Version: 3.9.5
X-Python-Version: >= 2.7
diff --git a/debian/patches/scons-isystem.diff b/debian/patches/scons-isystem.diff
new file mode 100644
index 0000000..d3b6b60
--- /dev/null
+++ b/debian/patches/scons-isystem.diff
@@ -0,0 +1,43 @@
+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 4e0fa14..2a5d014 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ manpage-spelling.patch
java_ignore_nonexistent_files.patch
remove_stale_files.patch
parallel_build.patch
+scons-isystem.diff