From a2a87f04ca7ad9b723b415272ef096b5ca342654 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 3 Sep 2022 16:08:46 +0200
Subject: [PATCH 1/7] New test release v1.11.4-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index bb09b97..46855f6 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3
+Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df
diff --git a/element-web b/element-web
index 2a51d27..f31e989 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488
+Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f
diff --git a/matrix-js-sdk b/matrix-js-sdk
index c2deb2a..12f88b5 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1
+Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded
diff --git a/matrix-react-sdk b/matrix-react-sdk
index bf34169..1ce24a8 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39
+Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283

From 04cb55d6c3c554653965936fa77550bb732a6b6a Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 3 Sep 2022 16:29:29 +0200
Subject: [PATCH 2/7] New test release v1.11.4-sc.0.test.2

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index 46855f6..c5897c9 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df
+Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f
diff --git a/element-web b/element-web
index f31e989..7a9cdfe 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f
+Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 1ce24a8..d4472ad 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283
+Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170

From 05ff60b4c3445623b1b902f4e8c9ad6359848da6 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 3 Sep 2022 19:02:18 +0200
Subject: [PATCH 3/7] New release v1.11.4-sc.1

---
 element-desktop | 2 +-
 element-web     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/element-desktop b/element-desktop
index c5897c9..d65b86b 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f
+Subproject commit d65b86bd451608954aadaccba8210ea3e658a16e
diff --git a/element-web b/element-web
index 7a9cdfe..70a4064 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67
+Subproject commit 70a406478e2a7dcefdbc877d0f223d5e6623dd18

From cd8998da62dfdc8531ad8b1509f4ad61caf75fd8 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 3 Sep 2022 22:04:10 +0200
Subject: [PATCH 4/7] Add script for changelog generation

---
 generate_changelog.sh | 61 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100755 generate_changelog.sh

diff --git a/generate_changelog.sh b/generate_changelog.sh
new file mode 100755
index 0000000..3bca794
--- /dev/null
+++ b/generate_changelog.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+
+pushd "$mydir" > /dev/null
+
+source ./merge_helpers.sh
+
+# Check branch
+check_branch $branch
+forall_repos check_branch $branch
+
+# Ensure clean git state
+forall_repos check_clean_git
+
+# Fetch upstream
+forall_repos git fetch origin > /dev/null
+forall_repos git fetch upstream > /dev/null
+
+(
+    # Add new line below git log: https://unix.stackexchange.com/a/345558
+
+    get_latest_upstream_tag
+    forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \
+        | printf '%s\n' "$(cat)" \
+        | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \
+        | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|"
+
+    get_current_mxsdk_tags
+
+    pushd "matrix-js-sdk" > /dev/null
+    git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \
+        | printf '%s\n' "$(cat)" \
+        | grep -v "Merge .*tag"
+    popd > /dev/null
+
+    pushd "matrix-react-sdk" > /dev/null
+    git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \
+        | printf '%s\n' "$(cat)" \
+        | grep -v "Merge .*tag"
+    popd > /dev/null
+) \
+    | grep -v "Automatic i18n reversion" \
+    | grep -v "Automatic package.json reversion" \
+    | grep -v "Merge .*branch" \
+    | grep -v "Automatic theme update" \
+    | grep -v "Automatic package.json adjustment" \
+    | grep -v "Automatic i18n adjustment" \
+    | grep -v "Update version to .*-sc\\..*" \
+    | grep -v "\\.sh" \
+    | grep -v "\\.md" \
+    | grep -v "Added translation using Weblate" \
+    | grep -v "Translated using Weblate" \
+    | grep -v "weblate/sc" \
+    | grep -v "\\[.*merge.*\\]" \
+    | awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \
+    || echo "No significant changes since the last stable release"
+
+popd > /dev/null

From dfa7921f9ad0141969faecc7e29c1b07886e1e4b Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 3 Sep 2022 22:26:58 +0200
Subject: [PATCH 5/7] Makefile: fixup just too useful everywhere

---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 95fd274..21c3bf4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
-.PHONY: clean
+.PHONY: clean undo_setup fixup
 
 CFGDIR ?= configs/sc
 
@@ -166,3 +166,11 @@ clean:
 	rm -rf element-web/dist
 	rm -rf local-pkgbuild
 	rm -f bom.lock
+
+undo_setup:
+	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
+
+fixup: undo_setup
+	make setup
+	make clean
+	make setup

From 30dc3ba5b9febbca7318ab433f53c1431091654e Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 3 Sep 2022 23:11:51 +0200
Subject: [PATCH 6/7] readme: Debian node 16

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f4d437d..9b1ea85 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ The following are the dependencies required to build SchildiChat Web/Desktop on
 ```
 # apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl
 
-# curl -sL https://deb.nodesource.com/setup_14.x | bash -
+# curl -sL https://deb.nodesource.com/setup_16.x | bash -
 # apt update
 # apt install nodejs
 

From e886c4c135935a86e89d18f8110312de82c09349 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 15 Sep 2022 17:46:31 +0200
Subject: [PATCH 7/7] New test release v1.11.5-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index d65b86b..acf7d17 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit d65b86bd451608954aadaccba8210ea3e658a16e
+Subproject commit acf7d174d2e91294db6b5c450d8bda5b7fde68dc
diff --git a/element-web b/element-web
index 70a4064..183a165 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 70a406478e2a7dcefdbc877d0f223d5e6623dd18
+Subproject commit 183a16501659bbd0f9a8178ebaa2c5a0ea252db5
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 12f88b5..e944aac 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded
+Subproject commit e944aacab07f03fd8d13559243cbd240e4b7f2c3
diff --git a/matrix-react-sdk b/matrix-react-sdk
index d4472ad..a552159 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170
+Subproject commit a55215909b7a1a526b2b11604f6327f2233232f2