From 1caaa224a274c7af268b699a1237c057d5f54edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Thu, 18 Jan 2024 11:50:23 +0100
Subject: [PATCH] chore: Release Fractal 6

---
 Cargo.lock                                |  2 +-
 Cargo.toml                                |  2 +-
 README.md                                 |  4 +-
 data/org.gnome.Fractal.metainfo.xml.in.in | 63 +++++++----------------
 meson.build                               |  4 +-
 5 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc83916d..8d77d6a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1495,7 +1495,7 @@ dependencies = [
 
 [[package]]
 name = "fractal"
-version = "6.0.0-rc"
+version = "6.0.0"
 dependencies = [
  "ashpd",
  "djb_hash",
diff --git a/Cargo.toml b/Cargo.toml
index 1aa56a9a..a14bbb2e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fractal"
-version = "6.0.0-rc"
+version = "6.0.0"
 authors = ["Julian Sparber <julian@sparber.net>"]
 edition = "2021"
 rust-version = "1.75"
diff --git a/README.md b/README.md
index ddf1869d..3289066c 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ development version while keeping the stable release around for daily use.
 
 ### Stable version
 
-The current stable version is 5 (released November 24th 2023).
+The current stable version is 6 (released January 18th 2024).
 
 You can get the official Fractal Flatpak from Flathub.
 
@@ -47,7 +47,7 @@ You can get the official Fractal Flatpak from Flathub.
 
 ### Beta version
 
-The current beta version is 6.rc (released January 4th 2024).
+The current beta version is 6, same as the stable version (released January 18th 2024).
 
 It is available as a Flatpak on Flathub Beta.
 
diff --git a/data/org.gnome.Fractal.metainfo.xml.in.in b/data/org.gnome.Fractal.metainfo.xml.in.in
index bf7c9a31..5312bcb6 100644
--- a/data/org.gnome.Fractal.metainfo.xml.in.in
+++ b/data/org.gnome.Fractal.metainfo.xml.in.in
@@ -15,7 +15,7 @@
     <ul>
       <li>Find rooms to discuss your favorite topics, or talk privately to people, securely thanks to end-to-end encryption</li>
       <li>Send rich formatted messages, files, or your current location</li>
-      <li>Reply to specific messages, react with emoji, edit or remove messages</li>
+      <li>Reply to specific messages, react with emoji, mention users or rooms, edit or remove messages</li>
       <li>View images, and play audio and video directly in the conversation</li>
       <li>See who has read messages, and who is typing</li>
       <li>Log into multiple accounts at once (with Single-Sign On support)</li>
@@ -65,69 +65,44 @@
   </content_rating>
 
   <releases>@development-release@
-    <release version="6~rc" type="development" date="2024-01-04">
+    <release version="6" type="stable" date="2024-01-18">
       <description>
         <p>
-          It is a new year 🎆️, and what better to way to celebrate this than to release Fractal
-          6.rc? It has been only 2 weeks since our latest beta release, but we have been hard at
-          work during the holidays.
+          Barely 2 months after Fractal 5, we feel there have been enough improvements to grant a
+          new stable release. You have probably noticed that we have adopted a version scheme
+          similar to GNOME and will bump the major version with each new release.
         </p>
         <p>
-          Here is an excerpt:
+          The list of goodies:
         </p>
         <ul>
           <li>
-            Matrix URIs can be opened with Fractal, it is even registered as a handler for the
-            matrix scheme
+            Fractal can open Matrix URIs, it is even registered as a handler for the “matrix”
+            scheme
           </li>
           <li>
-            Our Join Room dialog now shows some room details as a preview upon entering an
-            identifier or URI
+            The verification flow was rewritten, hopefully solving most verification issues
           </li>
           <li>
-            The verification flow was rewritten to rely more on the Matrix Rust SDK, hopefully
-            solving most issues that occurred before
+            Room members can be kicked, banned or ignored from their profile
           </li>
           <li>
-            Room members now have a profile page that allows, among other things, to kick, ban or
-            ignore them
+            More notifications settings, global or per-room, were added
           </li>
-          <li>Speaking of ignoring users, the list can be managed from the account settings</li>
           <li>
-            The dialog to view an event’s source was reworked to show more details about the
-            event
+            Times follow the format (12h or 24h) from the system settings
+          </li>
+          <li>
+            Tab auto-completion also works for mentioning public rooms, just start your query with
+            “#”
           </li>
         </ul>
         <p>
-          … and a lot of other improvements, fixes and new translations thanks to all our
-          contributors, and our upstream projects. As the version implies, it should be mostly
-          stable and we expect to only include minor improvements until the release of Fractal 6.
+          This version is fully translated into 6 languages 🙌️ and we hope to get even more 📈 for
+          the next one! Head over to Damned Lies if you want to give a hand.
         </p>
-      </description>
-    </release>
-    <release version="6~beta" type="development" date="2023-12-21">
-      <description>
-        <p>
-          Even though Fractal 5 was released only 1 month ago, development has been going at a
-          steady pace with a few new contributors, so we want our users to benefit from our
-          progress.
-        </p>
-        <p>
-          The staff’s picks:
-        </p>
-        <ul>
-          <li>Restoring sessions from Secret Services other than GNOME Keyring has been fixed</li>
-          <li>Times follow the format (12h or 24h) from the system settings</li>
-          <li>Media history works in encrypted rooms</li>
-          <li>The accessibility of the sidebar was improved</li>
-          <li>More notifications settings were added, you can now set global and per-room behavior and even manage your keywords</li>
-          <li>A bunch of refactoring, notably the port to the <code>glib::Properties</code> macro from gtk-rs that helped us removed almost <em>3000</em> lines of code!</li>
-        </ul>
         <p>
-          As usual, this release includes other improvements, fixes and new translations thanks to
-          all our contributors, and our upstream projects. As the version implies, there might be a
-          slight risk of regressions, but it should be mostly stable. If all goes well the next
-          step is the release candidate!
+          We would also like to thank our new and returning contributors and our upstream projects.
         </p>
       </description>
     </release>
diff --git a/meson.build b/meson.build
index a81e3d5d..50bc0898 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('fractal',
         'rust',
-        version: '6.rc',
+        version: '6',
         license: 'GPL-3.0-or-later',
         meson_version: '>= 0.59')
 
@@ -11,7 +11,7 @@ base_id = 'org.gnome.Fractal'
 application_id = base_id
 
 major_version = '6'
-pre_release_version = 'rc'
+pre_release_version = ''
 
 version = major_version
 if pre_release_version != ''