summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-06-15 09:25:51 +0000
committerLuca Falavigna <dktrkranz@debian.org>2010-06-15 09:25:51 +0000
commit880267373c30bc10c55c54deffb289a776a77098 (patch)
treee29abacbcbee89edd3f8f1029f833aadc35ca180
parent0cc4c348db65878d156dcb42f975bf897247bb89 (diff)
Refresh patches for new upstream release
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/java_ignore_nonexistent_files.patch2
-rw-r--r--debian/patches/remove_stale_files.patch2
3 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 99fd377..7a1afcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,11 @@ scons (2.0.0-1) UNRELEASED; urgency=low
* New upstream release.
- No longer use string exceptions (Closes: #585353).
+ * Refresh patches for new upstream release.
* debian/watch:
- Look for 2.0 branch.
- -- Luca Falavigna <dktrkranz@debian.org> Tue, 15 Jun 2010 09:21:45 +0000
+ -- Luca Falavigna <dktrkranz@debian.org> Tue, 15 Jun 2010 09:25:31 +0000
scons (1.3.0-1) unstable; urgency=low
diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch
index c3bd606..4a5268a 100644
--- a/debian/patches/java_ignore_nonexistent_files.patch
+++ b/debian/patches/java_ignore_nonexistent_files.patch
@@ -7,7 +7,7 @@ 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 @@
+@@ -90,6 +90,8 @@
version = env.get('JAVAVERSION', '1.4')
full_tlist = []
for f in slist:
diff --git a/debian/patches/remove_stale_files.patch b/debian/patches/remove_stale_files.patch
index 6083432..b2e4053 100644
--- a/debian/patches/remove_stale_files.patch
+++ b/debian/patches/remove_stale_files.patch
@@ -7,7 +7,7 @@ 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 @@
+@@ -1001,6 +1001,21 @@
if not nodes:
exit_status = 2