summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--debian/copyright2
-rw-r--r--debian/patches/java_ignore_nonexistent_files.patch8
-rw-r--r--debian/patches/manpage-spelling.patch12
-rw-r--r--debian/patches/remove_stale_files.patch8
5 files changed, 18 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d7180d..b7dc5c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ scons (2.3.4-1) unstable; urgency=medium
- Rewrite regex for finding all file extensions.
* Remove the search of libs in local source dirs for security reasons:
- New debian/patches/0020-secure_script_scons.patch.
+ * Refresh debian/patches
+ - manpage-spelling.patch, java_ignore_nonexistent_files.patch,
+ remove_stale_files.patch.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 05 Jan 2015 13:26:18 +0100
diff --git a/debian/copyright b/debian/copyright
index b9c4909..a1472b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,7 +22,7 @@ License: GPL-3.0+
Files: debian/patches/*
Copyright: 2010-2014 Luca Falavigna <dktrkranz@ubuntu.com>
- 2014 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2015 Jörg Frings-Fürst <debian@jff-webhosting.net>
License: Expat
License: Expat
diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch
index 5ba4713..6cf704e 100644
--- a/debian/patches/java_ignore_nonexistent_files.patch
+++ b/debian/patches/java_ignore_nonexistent_files.patch
@@ -3,11 +3,11 @@ 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
+Index: trunk/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 @@
+--- trunk.orig/engine/SCons/Tool/JavaCommon.py
++++ trunk/engine/SCons/Tool/JavaCommon.py
+@@ -283,7 +283,10 @@ if java_parsing:
return self.outer_state
def parse_java_file(fn, version=default_java_version):
diff --git a/debian/patches/manpage-spelling.patch b/debian/patches/manpage-spelling.patch
index 6e747c6..dc92ae7 100644
--- a/debian/patches/manpage-spelling.patch
+++ b/debian/patches/manpage-spelling.patch
@@ -5,9 +5,9 @@ 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 @@
+--- trunk.orig/scons.1
++++ trunk/scons.1
+@@ -4970,7 +4970,7 @@ env\&.Package( NAME = \*(Aqfoo
.PP
\fBPCH()\fR, \fBenv\&.PCH()\fR
.RS 4
@@ -16,7 +16,7 @@ Index: trunk/scons.1
.sp
.if n \{\
.RS 4
-@@ -5310,7 +5310,7 @@
+@@ -5307,7 +5307,7 @@ The
\fBPOTUpdate\fR
builder may be used with no target specified, in which case default target
messages\&.pot
@@ -25,7 +25,7 @@ Index: trunk/scons.1
\fB$POTDOMAIN\fR
construction variable or providing it as an override to
\fBPOTUpdate\fR
-@@ -5525,7 +5525,7 @@
+@@ -5522,7 +5522,7 @@ Alias
(\*(Aqpo\-update\*(Aq
by default)\&. The alias name may be changed through the
\fB$POUPDATE_ALIAS\fR
@@ -34,7 +34,7 @@ Index: trunk/scons.1
PO
files in your project by
\fBscons po\-update\fR\&.
-@@ -6351,7 +6351,7 @@
+@@ -6348,7 +6348,7 @@ file\&. Note, that the updated
POT
and
PO
diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch
index 1422d91..6b59283 100644
--- a/debian/patches/remove_stale_files.patch
+++ b/debian/patches/remove_stale_files.patch
@@ -3,11 +3,11 @@ 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
+Index: trunk/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 @@
+--- trunk.orig/engine/SCons/Script/Main.py
++++ trunk/engine/SCons/Script/Main.py
+@@ -1102,6 +1102,21 @@ def _main(parser):
print 'Found nothing to build'
exit_status = 2