Refreshed patches

5 files changed, 14 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 4f995b65..275f9236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ yosys (0.6-5) UNRELEASED; urgency=medium
     - Fixes FTBFS due to std::isfinite not found. (Closes: #822408)
   * Move PDFs in yosys-doc to /usr/share/doc/yosys in order to adhere to
     Debian Policy 12.3.
+  * Refreshed patches
 
  -- Ruben Undheim <ruben.undheim@gmail.com>  Tue, 03 May 2016 19:18:03 +0000
 
diff --git a/debian/patches/02_removeabc.patch b/debian/patches/02_removeabc.patch
index 19fcc3d2..c86d7f59 100644
--- a/debian/patches/02_removeabc.patch
+++ b/debian/patches/02_removeabc.patch
@@ -4,9 +4,9 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim@gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2015-10-07 23:54:26.216870697 +0400
-+++ yosys/Makefile	2015-10-07 23:54:26.212870482 +0400
-@@ -174,7 +174,7 @@
+--- yosys.orig/Makefile
++++ yosys/Makefile
+@@ -204,7 +204,7 @@ endif
  
  ifeq ($(ENABLE_ABC),1)
  CXXFLAGS += -DYOSYS_ENABLE_ABC
diff --git a/debian/patches/03_notruntests.patch b/debian/patches/03_notruntests.patch
index f471c5b0..6275dea2 100644
--- a/debian/patches/03_notruntests.patch
+++ b/debian/patches/03_notruntests.patch
@@ -4,9 +4,9 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim@gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2015-10-07 23:54:30.141082241 +0400
-+++ yosys/Makefile	2015-10-07 23:54:30.137082026 +0400
-@@ -347,21 +347,21 @@
+--- yosys.orig/Makefile
++++ yosys/Makefile
+@@ -377,21 +377,21 @@ endif
  yosys-abc$(EXE): abc/abc-$(ABCREV)$(EXE)
  	$(P) cp abc/abc-$(ABCREV)$(EXE) yosys-abc$(EXE)
  
@@ -43,7 +43,7 @@ Index: yosys/Makefile
  
  VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all
  
-@@ -491,6 +491,6 @@
+@@ -521,6 +521,6 @@ echo-git-rev:
  -include kernel/*.d
  -include techlibs/*/*.d
  
diff --git a/debian/patches/05_abc_executable.patch b/debian/patches/05_abc_executable.patch
index 2f6d9870..5a57903f 100644
--- a/debian/patches/05_abc_executable.patch
+++ b/debian/patches/05_abc_executable.patch
@@ -6,9 +6,9 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim@gmail.com>
 Index: yosys/passes/techmap/abc.cc
 ===================================================================
---- yosys.orig/passes/techmap/abc.cc	2015-10-07 23:55:52.445519056 +0400
-+++ yosys/passes/techmap/abc.cc	2015-10-07 23:55:52.441518840 +0400
-@@ -1270,7 +1270,7 @@
+--- yosys.orig/passes/techmap/abc.cc
++++ yosys/passes/techmap/abc.cc
+@@ -1289,7 +1289,7 @@ struct AbcPass : public Pass {
  		log_header("Executing ABC pass (technology mapping using ABC).\n");
  		log_push();
  
diff --git a/debian/patches/add-missing-headers.patch b/debian/patches/add-missing-headers.patch
index 42f5f0d8..1ba95e2b 100644
--- a/debian/patches/add-missing-headers.patch
+++ b/debian/patches/add-missing-headers.patch
@@ -2,9 +2,9 @@ Description: Include all headers needed to build the yosys plugins.
 Author: Sebastian Kuzminsky <seb@highlab.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2016-03-23 16:03:43.938560251 -0600
-+++ yosys/Makefile	2016-03-23 16:04:07.858313544 -0600
-@@ -269,6 +269,7 @@
+--- yosys.orig/Makefile
++++ yosys/Makefile
+@@ -268,6 +268,7 @@ $(eval $(call add_include_file,libs/ezsa
  $(eval $(call add_include_file,libs/sha1/sha1.h))
  $(eval $(call add_include_file,passes/fsm/fsmdata.h))
  $(eval $(call add_include_file,backends/ilang/ilang_backend.h))