[med-svn] [eagle] 02/05: Remove Fix_FTBFS.patch and Clarify_license.patch upstream fixed.

[Dylan Aïssi]

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

bob.dybian-guest pushed a commit to branch master
in repository eagle.

commit f650e574ed486149ea5ff9d4e7c2277e83b84884
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Sun Mar 5 22:49:51 2017 +0100

    Remove Fix_FTBFS.patch and Clarify_license.patch upstream fixed.
---
 debian/changelog                     |  1 +
 debian/patches/Clarify_license.patch | 17 -----------------
 debian/patches/Fix_FTBFS.patch       | 34 ----------------------------------
 debian/patches/series                |  2 --
 4 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6c7154..ae783e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ bio-eagle (2.3.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update d/watch to v4 and target github.
   * Update d/copyright: 2017.
+  * Remove Fix_FTBFS.patch and Clarify_license.patch upstream fixed.
 
  -- Dylan Aïssi <bob.dybian at gmail.com>  Sun, 05 Mar 2017 22:42:55 +0100
 
diff --git a/debian/patches/Clarify_license.patch b/debian/patches/Clarify_license.patch
deleted file mode 100644
index 10e495a..0000000
--- a/debian/patches/Clarify_license.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Dylan Aïssi
-Description: Clarify the license in order to be consistent with the header of src files.
- According to upstream, this should be fixed in eagle > 2.3
-Last-Update: 2016-09-13
-Forwarded: DONE
-
---- a/src/EagleMain.cpp
-+++ b/src/EagleMain.cpp
-@@ -214,7 +214,7 @@
-   cout << endl;
- 
-   cout << "Copyright (C) 2015-2016 Harvard University." << endl;
--  cout << "Distributed under the GNU GPLv3 open source license." << endl << endl;
-+  cout << "Distributed under the GNU GPLv3+ open source license." << endl << endl;
- 
-   //cout << "Boost version: " << BOOST_LIB_VERSION << endl;
-   //cout << endl;
diff --git a/debian/patches/Fix_FTBFS.patch b/debian/patches/Fix_FTBFS.patch
deleted file mode 100644
index 2811fa7..0000000
--- a/debian/patches/Fix_FTBFS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Po-Ru Loh
-Description: Fix FTBFS with GCC 6. Should be fixed in eagle > 2.3
-Last-Update: 2016-09-13
-
---- a/src/EagleImpMiss.cpp
-+++ b/src/EagleImpMiss.cpp
-@@ -18,6 +18,7 @@
- 
- #include <vector>
- #include <iostream>
-+#include <cmath>
- 
- #include "HapHedge.hpp"
- #include "MemoryUtils.hpp"
---- a/src/FileUtils.cpp
-+++ b/src/FileUtils.cpp
-@@ -151,7 +151,7 @@
-   }
- 
-   AutoGzIfstream::operator bool() const {
--    return boost_in;
-+    return !boost_in.fail();
-   }
- 
-   AutoGzIfstream& AutoGzIfstream::read(char *s, std::streamsize n) {
-@@ -209,7 +209,7 @@
-   }
- 
-   AutoGzOfstream::operator bool() const {
--    return boost_out;
-+    return !boost_out.fail();
-   }
- 
- }
diff --git a/debian/patches/series b/debian/patches/series
index bf8f5c9..98eb673 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 Makefile_config.patch
-Fix_FTBFS.patch
-Clarify_license.patch

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