diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2009-09-08 00:40:52 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2009-09-08 00:40:52 +0200 |
| commit | e1b9d466111911bd6270ad864d398de90093d205 (patch) | |
| tree | f1893cf271e44f811f391392b4d26857af47851e | |
| parent | 79ea7b35b8b94ddfe903702fde5931990bbfbdca (diff) | |
Remove patches merged upstream
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/no_commandline_arguments.patch | 18 | ||||
| -rw-r--r-- | debian/patches/remove_broken_symlinks.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 4 insertions, 41 deletions
diff --git a/debian/changelog b/debian/changelog index c0a3a01..eb70cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ scons (1.2.0.d20090905-1) UNRELEASED; urgency=low * New upstream checkpoint release. + * Remove obsolete patches, they have been merged upstream: + - debian/patches/no_commandline_arguments.patch + - debian/patches/remove_broken_symlinks.patch * Update my e-mail address. * Remove DM-Upload-Allowed field. * Switch to debhelper 7. @@ -10,7 +13,7 @@ scons (1.2.0.d20090905-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.8.3, no changes required. * Adhere to DEP3. - -- Luca Falavigna <dktrkranz@debian.org> Tue, 08 Sep 2009 00:11:37 +0200 + -- Luca Falavigna <dktrkranz@debian.org> Tue, 08 Sep 2009 00:40:30 +0200 scons (1.2.0-2) unstable; urgency=low diff --git a/debian/patches/no_commandline_arguments.patch b/debian/patches/no_commandline_arguments.patch deleted file mode 100644 index 3941f00..0000000 --- a/debian/patches/no_commandline_arguments.patch +++ /dev/null @@ -1,18 +0,0 @@ -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.patch b/debian/patches/remove_broken_symlinks.patch deleted file mode 100644 index 653500a..0000000 --- a/debian/patches/remove_broken_symlinks.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 9c562b9..b2967a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ java_ignore_nonexistent_files.patch -remove_broken_symlinks.patch -no_commandline_arguments.patch |