From 427b5a251bfb511528a177bfa92567b4b3ada3dd Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 21 Jan 2025 14:59:09 +0100
Subject: [PATCH 1/4] Release version 0.49

---
 CHANGELOG           | 11 ++++++++++-
 Makefile            |  4 ++--
 docs/source/conf.py |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1ebaeb24aa5..ec84318aabd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,17 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.48 .. Yosys 0.49-dev
+Yosys 0.48 .. Yosys 0.49
 --------------------------
+ * Various
+    - "$scopeinfo" cells are now part of JSON export by default.
+    - Added option to specify hierarchical separator for "flatten".
+    - Improved "wreduce" to handle more cases of operator size reduction.
+    - Updated hashing interface, see docs/source/yosys_internals/hashing.rst
+      for breaking API changes.
+
+ * New commands and options
+    - Added "-noscopeinfo" option to "json" and "write_json" pass.
 
 Yosys 0.47 .. Yosys 0.48
 --------------------------
diff --git a/Makefile b/Makefile
index ec47685f2ee..a6b742526bf 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.48+98
+YOSYS_VER := 0.49
 
 # Note: We arrange for .gitcommit to contain the (short) commit hash in
 # tarballs generated with git-archive(1) using .gitattributes. The git repo
@@ -169,7 +169,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline aaa5347.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline aaa5347.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index de0b9cf4ddf..a27b4dc6456 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -5,8 +5,8 @@
 
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
-copyright ='2024 YosysHQ GmbH'
-yosys_ver = "0.48"
+copyright ='2025 YosysHQ GmbH'
+yosys_ver = "0.49"
 
 # select HTML theme
 html_theme = 'furo-ys'

From e456f2e9724394fc34c899d59a1cb0ee578e96b3 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 21 Jan 2025 15:26:22 +0100
Subject: [PATCH 2/4] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ec84318aabd..d1c1f560a83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.49 .. Yosys 0.50-dev
+--------------------------
+
 Yosys 0.48 .. Yosys 0.49
 --------------------------
  * Various
diff --git a/Makefile b/Makefile
index a6b742526bf..6c63f22cc87 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.49
+YOSYS_VER := 0.49+0
 
 # Note: We arrange for .gitcommit to contain the (short) commit hash in
 # tarballs generated with git-archive(1) using .gitattributes. The git repo
@@ -169,7 +169,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline aaa5347.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 427b5a2.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From 4a27d93b06848466a1b87864d0e8da619bdab6d9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 00:20:51 +0000
Subject: [PATCH 3/4] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6c63f22cc87..896d44203f1 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.49+0
+YOSYS_VER := 0.49+1
 
 # Note: We arrange for .gitcommit to contain the (short) commit hash in
 # tarballs generated with git-archive(1) using .gitattributes. The git repo

From 3076803c9e3742859e42a00c62af9441fb8b9339 Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Thu, 23 Jan 2025 05:17:52 +0000
Subject: [PATCH 4/4] write_json: missing \n in help text.

---
 backends/json/json.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/json/json.cc b/backends/json/json.cc
index 20d42f626ed..749fe1fc313 100644
--- a/backends/json/json.cc
+++ b/backends/json/json.cc
@@ -408,7 +408,7 @@ struct JsonBackend : public Backend {
 		log("\n");
 		log("The \"offset\" and \"upto\" fields are skipped if their value would be 0.\n");
 		log("They don't affect connection semantics, and are only used to preserve original\n");
-		log("HDL bit indexing.");
+		log("HDL bit indexing.\n");
 		log("And <cell_details> is:\n");
 		log("\n");
 		log("    {\n");