From c9cd449bba73375c25f9ef4c31caf80d0506ff63 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 16 Feb 2024 12:51:39 -0500
Subject: [PATCH 1/2] Revert "Support a new changelog entry type: deps"

This reverts commit 4648997a1017da68dcf5235e527e861f2c85cf91.
---
 tools/check-changelog   | 2 +-
 tools/collect-changelog | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/check-changelog b/tools/check-changelog
index 28ef8454e..d053ed577 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git
 git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
 git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
-    grep ' A\t' | grep '\.\(add\|change\|deps\|fix\|remove\|security\)$'
+    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$'
 ret=$?
 
 if [ $ret -eq 0 ]; then
diff --git a/tools/collect-changelog b/tools/collect-changelog
index d0e4905d4..1e12d5640 100755
--- a/tools/collect-changelog
+++ b/tools/collect-changelog
@@ -23,6 +23,5 @@ collectType change Changed
 collectType add Added
 collectType fix Fixed
 collectType remove Removed
-collectType deps Dependencies
 
 rm changelog.d/*

From 1951d56ed9651abc8f6a9d4dc02b7f976274415f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 16 Feb 2024 12:53:18 -0500
Subject: [PATCH 2/2] Revert "Add support for a "deps" changelog type and
 document deps changes since 2.6.1 release"

This reverts commit 2a4fa4c408d874d8b938f780337d2956b6f0101f.
---
 changelog.d/bandit.change                  | 1 +
 changelog.d/bandit.deps                    | 1 -
 changelog.d/eblurhash.deps                 | 1 -
 changelog.d/exile.deps                     | 1 -
 changelog.d/floki.deps                     | 1 -
 changelog.d/http_signatures.deps           | 1 -
 changelog.d/phoenix.deps                   | 1 -
 changelog.d/{promex.deps => promex.change} | 0
 changelog.d/vix.deps                       | 1 -
 9 files changed, 1 insertion(+), 7 deletions(-)
 create mode 100644 changelog.d/bandit.change
 delete mode 100644 changelog.d/bandit.deps
 delete mode 100644 changelog.d/eblurhash.deps
 delete mode 100644 changelog.d/exile.deps
 delete mode 100644 changelog.d/floki.deps
 delete mode 100644 changelog.d/http_signatures.deps
 delete mode 100644 changelog.d/phoenix.deps
 rename changelog.d/{promex.deps => promex.change} (100%)
 delete mode 100644 changelog.d/vix.deps

diff --git a/changelog.d/bandit.change b/changelog.d/bandit.change
new file mode 100644
index 000000000..7a1104314
--- /dev/null
+++ b/changelog.d/bandit.change
@@ -0,0 +1 @@
+Support Bandit as an alternative to Cowboy for the HTTP server. 
diff --git a/changelog.d/bandit.deps b/changelog.d/bandit.deps
deleted file mode 100644
index b60d1d39c..000000000
--- a/changelog.d/bandit.deps
+++ /dev/null
@@ -1 +0,0 @@
-Support Bandit as an alternative to Cowboy for the HTTP server
diff --git a/changelog.d/eblurhash.deps b/changelog.d/eblurhash.deps
deleted file mode 100644
index 0f7f7ed5f..000000000
--- a/changelog.d/eblurhash.deps
+++ /dev/null
@@ -1 +0,0 @@
-Replaced eblurhash with rinpatch_blurhash
diff --git a/changelog.d/exile.deps b/changelog.d/exile.deps
deleted file mode 100644
index fa1b7a004..000000000
--- a/changelog.d/exile.deps
+++ /dev/null
@@ -1 +0,0 @@
-Add exile to replace custom process streaming implementation for calls to ffmpeg
diff --git a/changelog.d/floki.deps b/changelog.d/floki.deps
deleted file mode 100644
index 35f70f6f7..000000000
--- a/changelog.d/floki.deps
+++ /dev/null
@@ -1 +0,0 @@
-Update Floki to 0.3.5
diff --git a/changelog.d/http_signatures.deps b/changelog.d/http_signatures.deps
deleted file mode 100644
index 9ae1cd75a..000000000
--- a/changelog.d/http_signatures.deps
+++ /dev/null
@@ -1 +0,0 @@
-Update http-signatures to 0.1.2
diff --git a/changelog.d/phoenix.deps b/changelog.d/phoenix.deps
deleted file mode 100644
index 62dd9d1b8..000000000
--- a/changelog.d/phoenix.deps
+++ /dev/null
@@ -1 +0,0 @@
-Update Phoenix to 1.7.3
diff --git a/changelog.d/promex.deps b/changelog.d/promex.change
similarity index 100%
rename from changelog.d/promex.deps
rename to changelog.d/promex.change
diff --git a/changelog.d/vix.deps b/changelog.d/vix.deps
deleted file mode 100644
index 68c361760..000000000
--- a/changelog.d/vix.deps
+++ /dev/null
@@ -1 +0,0 @@
-Add Vix for image processing with libvips to replace some usage of ImageMagick