summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Undheim <ruben.undheim@gmail.com>2016-05-14 15:35:13 +0200
committerRuben Undheim <ruben.undheim@gmail.com>2016-05-14 15:44:00 +0200
commit979df8e9ca858af8154068d33b8bc6eeba08761d (patch)
tree6efdcbe3104cea53ea9eeac7b8053e882003ec19
parentb1fb20c2ac32b84ceda9f4655acc495377779813 (diff)
Reordered fields in patches
-rw-r--r--debian/patches/01_gitrevision.patch3
-rw-r--r--debian/patches/02_removeabc.patch3
-rw-r--r--debian/patches/03_notruntests.patch3
-rw-r--r--debian/patches/05_abc_executable.patch5
-rw-r--r--debian/patches/add-missing-headers.patch2
-rw-r--r--debian/patches/fix_ftbfs_cannot_find_infinite.patch3
-rw-r--r--debian/patches/kfreebsd-support.patch2
-rw-r--r--debian/patches/manual-build.patch2
-rw-r--r--debian/patches/spelling-fixes.patch3
-rw-r--r--debian/patches/switch-to-free-font.patch2
10 files changed, 17 insertions, 11 deletions
diff --git a/debian/patches/01_gitrevision.patch b/debian/patches/01_gitrevision.patch
index 049f1eb5..60dedc1e 100644
--- a/debian/patches/01_gitrevision.patch
+++ b/debian/patches/01_gitrevision.patch
@@ -1,10 +1,11 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
Subject: Compilation from the upstream code depends on being in
the git repository to get the correct git-revision to be shown when
running the program. This patch puts in the git revision from the
correct upstream.
It must be updated every time upstream changes!
+
Forwarded: doesn't make sense upstream
-From: Ruben Undheim <ruben.undheim@gmail.com>
Index: yosys/Makefile
===================================================================
--- yosys.orig/Makefile 2016-02-27 16:25:32.341035024 -0700
diff --git a/debian/patches/02_removeabc.patch b/debian/patches/02_removeabc.patch
index 7bb0f71c..38c09b4b 100644
--- a/debian/patches/02_removeabc.patch
+++ b/debian/patches/02_removeabc.patch
@@ -1,7 +1,8 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
Subject: Don't build abc when building yosys.
It is built as a separate source package.
+
Forwarded: doesn't make sense upstream
-From: Ruben Undheim <ruben.undheim@gmail.com>
Index: yosys/Makefile
===================================================================
--- yosys.orig/Makefile
diff --git a/debian/patches/03_notruntests.patch b/debian/patches/03_notruntests.patch
index 9e953f63..e0f0e640 100644
--- a/debian/patches/03_notruntests.patch
+++ b/debian/patches/03_notruntests.patch
@@ -1,7 +1,8 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
Subject: Do not run the long test suite when
building for debian.
+
Forwarded: doesn't make sense upstream
-From: Ruben Undheim <ruben.undheim@gmail.com>
Index: yosys/Makefile
===================================================================
--- yosys.orig/Makefile
diff --git a/debian/patches/05_abc_executable.patch b/debian/patches/05_abc_executable.patch
index ce2e2890..8ebb6ae6 100644
--- a/debian/patches/05_abc_executable.patch
+++ b/debian/patches/05_abc_executable.patch
@@ -1,9 +1,10 @@
-Subjec: The dependency abc is built with the name yosys-abc
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Subject: The dependency abc is built with the name yosys-abc
upstream. Since it is available as a separate package independently
of yosys, it is not called yosys-abc in debian.
This patch changes the name of the command that yosys looks for.
+
Forwarded: doesn't make sense upstream
-From: Ruben Undheim <ruben.undheim@gmail.com>
Index: yosys/passes/techmap/abc.cc
===================================================================
--- yosys.orig/passes/techmap/abc.cc
diff --git a/debian/patches/add-missing-headers.patch b/debian/patches/add-missing-headers.patch
index 181ee130..af3eebd1 100644
--- a/debian/patches/add-missing-headers.patch
+++ b/debian/patches/add-missing-headers.patch
@@ -1,5 +1,5 @@
-Subject: Include all headers needed to build the yosys plugins.
From: Sebastian Kuzminsky <seb@highlab.com>
+Subject: Include all headers needed to build the yosys plugins.
Index: yosys/Makefile
===================================================================
--- yosys.orig/Makefile
diff --git a/debian/patches/fix_ftbfs_cannot_find_infinite.patch b/debian/patches/fix_ftbfs_cannot_find_infinite.patch
index 74852747..b16380a0 100644
--- a/debian/patches/fix_ftbfs_cannot_find_infinite.patch
+++ b/debian/patches/fix_ftbfs_cannot_find_infinite.patch
@@ -1,6 +1,7 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
Subject: This patch fixes an FTBFS due to std::infinite not
available
-From: Ruben Undheim <ruben.undheim@gmail.com>
+
Bug-Debian: https://bugs.debian.org/822408
Index: yosys/frontends/ast/ast.cc
diff --git a/debian/patches/kfreebsd-support.patch b/debian/patches/kfreebsd-support.patch
index 78e4a05c..18e47cc9 100644
--- a/debian/patches/kfreebsd-support.patch
+++ b/debian/patches/kfreebsd-support.patch
@@ -1,8 +1,8 @@
+From: Sebastian Kuzminsky <seb@highlab.com>
Subject: Change yosys to look for the #define constant "__unix__"
instead of "__linux__", to select code appropriate for Unix-like
systems. This has been tested with Clang 3.5 and GCC 4.6, 4.8, and
4.9 on Linux, and Clang 3.5 and GCC 4.9 on kFreeBSD.
-From: Sebastian Kuzminsky <seb@highlab.com>
Index: yosys/kernel/driver.cc
===================================================================
diff --git a/debian/patches/manual-build.patch b/debian/patches/manual-build.patch
index 9f1ee9cd..ff390ff7 100644
--- a/debian/patches/manual-build.patch
+++ b/debian/patches/manual-build.patch
@@ -1,6 +1,6 @@
+From: Sebastian Kuzminsky <seb@highlab.com>
Subject: build the manual using the headers from the source tree, not
the installed ones.
-From: Sebastian Kuzminsky <seb@highlab.com>
Index: yosys/manual/PRESENTATION_Prog/Makefile
===================================================================
--- yosys.orig/manual/PRESENTATION_Prog/Makefile 2016-02-28 22:25:29.557021857 -0700
diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch
index 4762b296..7110eee6 100644
--- a/debian/patches/spelling-fixes.patch
+++ b/debian/patches/spelling-fixes.patch
@@ -1,6 +1,7 @@
+From: Sebastian Kuzminsky <seb@highlab.com>
Subject: Fix some spelling mistakes in upstream's strings.
+
Forwarded: accepted by upstream in PR #119
-From: Sebastian Kuzminsky <seb@highlab.com>
Index: yosys/backends/json/json.cc
===================================================================
--- yosys.orig/backends/json/json.cc 2016-02-24 15:41:34.500689004 -0700
diff --git a/debian/patches/switch-to-free-font.patch b/debian/patches/switch-to-free-font.patch
index b8c7304c..c6faf245 100644
--- a/debian/patches/switch-to-free-font.patch
+++ b/debian/patches/switch-to-free-font.patch
@@ -1,5 +1,5 @@
-Subject: Switch the yosys manual font from luximono (non-free) to libertine (free)
From: Sebastian Kuzminsky <seb@highlab.com>
+Subject: Switch the yosys manual font from luximono (non-free) to libertine (free)
Index: yosys/manual/APPNOTE_010_Verilog_to_BLIF.tex
===================================================================
--- yosys.orig/manual/APPNOTE_010_Verilog_to_BLIF.tex 2016-02-28 22:17:25.000000000 -0700