From 50de1c9e52eee572103ab1c8a5d8e6b5bbdaabc8 Mon Sep 17 00:00:00 2001
From: Kevin O'Gorman <kog@freedom.press>
Date: Tue, 20 Jun 2023 15:49:22 -0400
Subject: [PATCH] SecureDrop 2.6.0-rc2

---
 changelog.md                                         | 9 ++++++++-
 install_files/ansible-base/group_vars/all/securedrop | 2 +-
 securedrop/debian/changelog                          | 6 ++++++
 securedrop/setup.py                                  | 2 +-
 securedrop/version.py                                | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 636bc35730..449e3ce979 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.6.0~rc2
+
+### Web applications
+* Fixed display bug when duplicate locales are specified (#6853)
+* Dependency changes:
+  * Update cryptography from 39.0.1 to 41.0.1 (#6855)
+
 ## 2.6.0~rc1
 
 ### Web applications
@@ -23,7 +30,7 @@
   * Remove pyotp (#5613, #6679)
 
 ### Journalist Workstation
-* Add a GNOME shell extension (#6531, #6712)
+* Add a GNOME shell extension (#6531, #6712, 6847)
 
 ### Operations
 * Update SecureDrop release key expiry date to 2024-07-08 (#6803, #6804, #6819)
diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop
index 3fa40776e1..1e6065585d 100644
--- a/install_files/ansible-base/group_vars/all/securedrop
+++ b/install_files/ansible-base/group_vars/all/securedrop
@@ -2,7 +2,7 @@
 # Variables that apply to both the app and monitor server go in this file
 # If the monitor or app server need different values define the variable in
 # hosts_vars/app.yml or host_vars/mon.yml
-securedrop_version: "2.6.0~rc1"
+securedrop_version: "2.6.0~rc2"
 securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz"
 
 grsecurity: true
diff --git a/securedrop/debian/changelog b/securedrop/debian/changelog
index 43dc115ee6..64a3197b56 100644
--- a/securedrop/debian/changelog
+++ b/securedrop/debian/changelog
@@ -1,3 +1,9 @@
+securedrop (2.6.0~rc2+focal) focal; urgency=medium
+
+  * see changelog.md 
+
+ -- SecureDrop Team <securedrop@freedom.press>  Tue, 20 Jun 2023 15:49:14 -0400
+
 securedrop (2.6.0~rc1+focal) focal; urgency=medium
 
   * see changelog.md
diff --git a/securedrop/setup.py b/securedrop/setup.py
index 6c5d051f9a..84eb6f9e6a 100644
--- a/securedrop/setup.py
+++ b/securedrop/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="securedrop-app-code",
-    version="2.6.0~rc1",
+    version="2.6.0~rc2",
     author="Freedom of the Press Foundation",
     author_email="securedrop@freedom.press",
     description="SecureDrop Server",
diff --git a/securedrop/version.py b/securedrop/version.py
index aed0851414..a658073c20 100644
--- a/securedrop/version.py
+++ b/securedrop/version.py
@@ -1 +1 @@
-__version__ = "2.6.0~rc1"
+__version__ = "2.6.0~rc2"