[med-svn] [libundead] 02/02: Drop import fix patches: Applied upstream

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

ximion-guest pushed a commit to branch master
in repository libundead.

commit 1d84aeae9024259db346cd7a2f19ffbe6e7b1e86
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Thu Aug 3 21:35:41 2017 -0400

    Drop import fix patches: Applied upstream
---
 debian/patches/02_fix-import-deprecations.patch | 32 ---------------
 debian/patches/{isNan.patch => 02_isNan.patch}  |  0
 debian/patches/03_fix-imports.patch             | 53 -------------------------
 debian/patches/series                           |  4 +-
 4 files changed, 1 insertion(+), 88 deletions(-)

diff --git a/debian/patches/02_fix-import-deprecations.patch b/debian/patches/02_fix-import-deprecations.patch
deleted file mode 100644
index dede2d9..0000000
--- a/debian/patches/02_fix-import-deprecations.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e82d8b8df2e3889a10ae96c33f9de34cda6e5459 Mon Sep 17 00:00:00 2001
-From: John Colvin <john.loughran.colvin at gmail.com>
-Date: Mon, 5 Dec 2016 11:01:04 +0000
-Subject: [PATCH] fix import deprecations
-
----
- src/undead/cstream.d | 2 +-
- src/undead/date.d    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/undead/cstream.d
-+++ b/src/undead/cstream.d
-@@ -149,7 +149,7 @@
- 
-   // run a few tests
-   unittest {
--    import undead.internal.file : deleteme;
-+    import undead.internal.file;
-     import std.internal.cstring : tempCString;
- 
-     auto stream_file = (undead.internal.file.deleteme ~ "-stream.txt").tempCString();
---- a/src/undead/date.d
-+++ b/src/undead/date.d
-@@ -821,7 +821,7 @@
-         auto result = makeDate(day,time);
-         return timeClip(result);
-     }
--    catch
-+    catch (Exception e)
-     {
-         return d_time_nan;                // erroneous date string
-     }
diff --git a/debian/patches/isNan.patch b/debian/patches/02_isNan.patch
similarity index 100%
rename from debian/patches/isNan.patch
rename to debian/patches/02_isNan.patch
diff --git a/debian/patches/03_fix-imports.patch b/debian/patches/03_fix-imports.patch
deleted file mode 100644
index 1b3a209..0000000
--- a/debian/patches/03_fix-imports.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 56ee5dde18b3aac3ac919b6571eefe6cd22bc034 Mon Sep 17 00:00:00 2001
-From: John Colvin <john.loughran.colvin at gmail.com>
-Date: Mon, 5 Dec 2016 10:58:13 +0000
-Subject: [PATCH] fix import errors
-
----
- src/undead/stream.d | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/src/undead/stream.d
-+++ b/src/undead/stream.d
-@@ -83,7 +83,7 @@
-   import std.utf;
-   import core.bitop; // for bswap
-   import core.vararg;
--  import std.file;
-+  static import std.file;
-   import undead.internal.file;
-   import undead.doformat;
- }
-@@ -1433,11 +1433,11 @@
-   unittest { // unit test for Issue 3363
-     import std.stdio;
-     immutable fileName = undead.internal.file.deleteme ~ "-issue3363.txt";
--    auto w = File(fileName, "w");
--    scope (exit) remove(fileName.ptr);
-+    auto w = std.stdio.File(fileName, "w");
-+    scope (exit) std.file.remove(fileName);
-     w.write("one two three");
-     w.close();
--    auto r = File(fileName, "r");
-+    auto r = std.stdio.File(fileName, "r");
-     const(char)[] constChar;
-     string str;
-     char[] chars;
-@@ -2208,7 +2208,7 @@
-     assert( lines[2] == "");
-     assert( lines[3] == "That was blank");
-     file.close();
--    remove(stream_file.tempCString());
-+    std.file.remove(stream_file);
-   }
- }
- 
-@@ -2303,7 +2303,7 @@
-     // we must be at the end of file
-     assert(file.eof);
-     file.close();
--    remove(stream_file.tempCString());
-+    std.file.remove(stream_file);
-   }
- 
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6f230c8..bb43ed1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 01_meson-build.patch.patch
-02_fix-import-deprecations.patch
-03_fix-imports.patch
-isNan.patch
+02_isNan.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libundead.git