From 4ef312e07bb9c774a89eb4b755feabfc151351a8 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sat, 1 Aug 2009 20:52:02 +0200 Subject: Adhere to DEP3 --- debian/changelog | 3 ++- debian/patches/java_ignore_nonexistent_files | 17 ----------------- debian/patches/java_ignore_nonexistent_files.patch | 18 ++++++++++++++++++ debian/patches/no_commandline_arguments | 17 ----------------- debian/patches/no_commandline_arguments.patch | 18 ++++++++++++++++++ debian/patches/remove_broken_symlinks | 19 ------------------- debian/patches/remove_broken_symlinks.patch | 20 ++++++++++++++++++++ debian/patches/series | 6 +++--- 8 files changed, 61 insertions(+), 57 deletions(-) delete mode 100644 debian/patches/java_ignore_nonexistent_files create mode 100644 debian/patches/java_ignore_nonexistent_files.patch delete mode 100644 debian/patches/no_commandline_arguments create mode 100644 debian/patches/no_commandline_arguments.patch delete mode 100644 debian/patches/remove_broken_symlinks create mode 100644 debian/patches/remove_broken_symlinks.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3e5aee8..96e6052 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ scons (1.2.0-3) UNRELEASED; urgency=low * Do not build-depend on unnecessary python-dev, replace it with python. * Add Vcs-* fields to document where SCons debianisation is stored. * Bump Standards-Version to 3.8.2, no changes required. + * Adhere to DEP3. - -- Luca Falavigna Sat, 01 Aug 2009 20:39:23 +0200 + -- Luca Falavigna Sat, 01 Aug 2009 20:51:45 +0200 scons (1.2.0-2) unstable; urgency=low diff --git a/debian/patches/java_ignore_nonexistent_files b/debian/patches/java_ignore_nonexistent_files deleted file mode 100644 index 123b72c..0000000 --- a/debian/patches/java_ignore_nonexistent_files +++ /dev/null @@ -1,17 +0,0 @@ -Description: Check for file/symlink existence before trying to use it in Java(). -Upstream bug: http://scons.tigris.org/issues/show_bug.cgi?id=2207 -Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338232 - -Index: scons-1.1.0/engine/SCons/Tool/javac.py -=================================================================== ---- scons-1.1.0.orig/engine/SCons/Tool/javac.py 2008-10-11 18:11:46.083270910 +0200 -+++ scons-1.1.0/engine/SCons/Tool/javac.py 2008-10-11 18:13:04.519739110 +0200 -@@ -94,6 +94,8 @@ - version = env.get('JAVAVERSION', '1.4') - full_tlist = [] - for f in slist: -+ if not os.path.exists(f.rfile().get_abspath()): -+ continue - tlist = [] - source_file_based = True - pkg_dir = None diff --git a/debian/patches/java_ignore_nonexistent_files.patch b/debian/patches/java_ignore_nonexistent_files.patch new file mode 100644 index 0000000..5eb6a4a --- /dev/null +++ b/debian/patches/java_ignore_nonexistent_files.patch @@ -0,0 +1,18 @@ +Description: Check for file/symlink existence before trying to use it in Java() +Origin: Debian +Bug-Debian: http://bugs.debian.org/338232 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2207 + +Index: scons-1.1.0/engine/SCons/Tool/javac.py +=================================================================== +--- scons-1.1.0.orig/engine/SCons/Tool/javac.py 2008-10-11 18:11:46.083270910 +0200 ++++ scons-1.1.0/engine/SCons/Tool/javac.py 2008-10-11 18:13:04.519739110 +0200 +@@ -94,6 +94,8 @@ + version = env.get('JAVAVERSION', '1.4') + full_tlist = [] + for f in slist: ++ if not os.path.exists(f.rfile().get_abspath()): ++ continue + tlist = [] + source_file_based = True + pkg_dir = None diff --git a/debian/patches/no_commandline_arguments b/debian/patches/no_commandline_arguments deleted file mode 100644 index a5be27c..0000000 --- a/debian/patches/no_commandline_arguments +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix an exception when a null command-line argument is passed in. -Upstream bug: http://scons.tigris.org/issues/show_bug.cgi?id=2368 -Ubuntu bug: https://launchpad.net/bugs/338492 - -Index: scons-1.2.0/engine/SCons/Script/Main.py -=================================================================== ---- scons-1.2.0.orig/engine/SCons/Script/Main.py 2009-03-06 08:13:35.000000000 +0000 -+++ scons-1.2.0/engine/SCons/Script/Main.py 2009-03-06 08:13:57.000000000 +0000 -@@ -869,7 +869,7 @@ - targets = [] - xmit_args = [] - for a in parser.largs: -- if a[0] == '-': -+ if a[:1] == '-': - continue - if '=' in a: - xmit_args.append(a) diff --git a/debian/patches/no_commandline_arguments.patch b/debian/patches/no_commandline_arguments.patch new file mode 100644 index 0000000..3941f00 --- /dev/null +++ b/debian/patches/no_commandline_arguments.patch @@ -0,0 +1,18 @@ +Description: Fix an exception when a null command-line argument is passed in +Origin: Ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/338492 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2368 + +Index: scons-1.2.0/engine/SCons/Script/Main.py +=================================================================== +--- scons-1.2.0.orig/engine/SCons/Script/Main.py 2009-03-06 08:13:35.000000000 +0000 ++++ scons-1.2.0/engine/SCons/Script/Main.py 2009-03-06 08:13:57.000000000 +0000 +@@ -869,7 +869,7 @@ + targets = [] + xmit_args = [] + for a in parser.largs: +- if a[0] == '-': ++ if a[:1] == '-': + continue + if '=' in a: + xmit_args.append(a) diff --git a/debian/patches/remove_broken_symlinks b/debian/patches/remove_broken_symlinks deleted file mode 100644 index f28a4d7..0000000 --- a/debian/patches/remove_broken_symlinks +++ /dev/null @@ -1,19 +0,0 @@ -Description: In Clean() routine, try to delete symlinks even if files they point to are not available. -Upstream bug: http://scons.tigris.org/issues/show_bug.cgi?id=2095 -Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485521 - -Index: scons-1.2.0/engine/SCons/Script/Main.py -=================================================================== ---- scons-1.2.0.orig/engine/SCons/Script/Main.py 2008-12-26 17:46:29.470044569 +0100 -+++ scons-1.2.0/engine/SCons/Script/Main.py 2008-12-26 17:46:40.238042348 +0100 -@@ -328,6 +328,10 @@ - # then delete dir itself - if remove: os.rmdir(path) - display("Removed directory " + pathstr) -+ else: -+ if os.path.islink(path): -+ if remove: os.unlink(path) -+ display("Removed " + pathstr) - except (IOError, OSError), e: - print "scons: Could not remove '%s':" % pathstr, e.strerror - diff --git a/debian/patches/remove_broken_symlinks.patch b/debian/patches/remove_broken_symlinks.patch new file mode 100644 index 0000000..653500a --- /dev/null +++ b/debian/patches/remove_broken_symlinks.patch @@ -0,0 +1,20 @@ +Description: In Clean() routine, try to delete symlinks even if files they point to are not available +Origin: Debian +Bug-Debian: http://bugs.debian.org/485521 +Forwarded: http://scons.tigris.org/issues/show_bug.cgi?id=2095 + +Index: scons-1.2.0/engine/SCons/Script/Main.py +=================================================================== +--- scons-1.2.0.orig/engine/SCons/Script/Main.py 2008-12-26 17:46:29.470044569 +0100 ++++ scons-1.2.0/engine/SCons/Script/Main.py 2008-12-26 17:46:40.238042348 +0100 +@@ -328,6 +328,10 @@ + # then delete dir itself + if remove: os.rmdir(path) + display("Removed directory " + pathstr) ++ else: ++ if os.path.islink(path): ++ if remove: os.unlink(path) ++ display("Removed " + pathstr) + except (IOError, OSError), e: + print "scons: Could not remove '%s':" % pathstr, e.strerror + diff --git a/debian/patches/series b/debian/patches/series index db145e8..9c562b9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -java_ignore_nonexistent_files -remove_broken_symlinks -no_commandline_arguments +java_ignore_nonexistent_files.patch +remove_broken_symlinks.patch +no_commandline_arguments.patch -- cgit v1.2.3