From e09ff0b4b0654fd6dbcf8c0bdc73fdb9ae7d8016 Mon Sep 17 00:00:00 2001
From: Kirill Chibisov <contact@kchibisov.com>
Date: Sun, 10 Jul 2022 23:55:57 +0300
Subject: Use org.alacritty instead of io.alacritty

The common naming is reverse DNS, and given that alacritty is using
alacritty.org it makes more sense to use org.alacritty instead of
old io.alacritty.
---
 CHANGELOG.md                                    |  2 ++
 extra/linux/io.alacritty.Alacritty.appdata.xml  | 33 -------------------------
 extra/linux/org.alacritty.Alacritty.appdata.xml | 33 +++++++++++++++++++++++++
 extra/osx/Alacritty.app/Contents/Info.plist     |  2 +-
 4 files changed, 36 insertions(+), 34 deletions(-)
 delete mode 100644 extra/linux/io.alacritty.Alacritty.appdata.xml
 create mode 100644 extra/linux/org.alacritty.Alacritty.appdata.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe1b7f0d..b6b31e05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Packaging
 
 - Minimum Rust version has been bumped to 1.57.0
+- Renamed `io.alacritty.Alacritty.appdata.xml` to `org.alacritty.Alacritty.appdata.xml`
+- Renamed `io.alacritty` to `org.alacritty` for `Alacritty.app`
 
 ### Added
 
diff --git a/extra/linux/io.alacritty.Alacritty.appdata.xml b/extra/linux/io.alacritty.Alacritty.appdata.xml
deleted file mode 100644
index af82c474..00000000
--- a/extra/linux/io.alacritty.Alacritty.appdata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016-2019 Joe Wilm, The Alacritty Project Contributors -->
-<component type="desktop-application">
-  <id>io.alacritty.Alacritty</id>
-  <!-- Translators: The application name -->
-  <name>Alacritty</name>
-  <project_license>APACHE-2.0</project_license>
-  <metadata_license>APACHE-2.0</metadata_license>
-  <!-- Translators: The application's summary / tagline -->
-  <summary>A fast, cross-platform, OpenGL terminal emulator</summary>
-  <description>
-    <p>
-      Alacritty is a modern terminal emulator that comes with sensible defaults,
-      but allows for extensive configuration. By integrating with other
-      applications, rather than reimplementing their functionality, it manages
-      to provide a flexible set of features with high performance.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://user-images.githubusercontent.com/8886672/103264352-5ab0d500-49a2-11eb-8961-02f7da66c855.png</image>
-      <caption>Alacritty - A fast, cross-platform, OpenGL terminal emulator</caption>
-    </screenshot>
-  </screenshots>
-  <keywords>
-    <keyword>terminal emulator</keyword>
-    <keyword>GPU</keyword>
-  </keywords>
-  <url type="homepage">https://github.com/alacritty/alacritty</url>
-  <url type="bugtracker">https://github.com/alacritty/alacritty/issues</url>
-  <update_contact>https://github.com/alacritty/alacritty/blob/master/CONTRIBUTING.md#contact</update_contact>
-  <developer_name>Christian Duerr</developer_name>
-</component>
diff --git a/extra/linux/org.alacritty.Alacritty.appdata.xml b/extra/linux/org.alacritty.Alacritty.appdata.xml
new file mode 100644
index 00000000..ddfdd281
--- /dev/null
+++ b/extra/linux/org.alacritty.Alacritty.appdata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016-2022 Joe Wilm, The Alacritty Project Contributors -->
+<component type="desktop-application">
+  <id>org.alacritty.Alacritty</id>
+  <!-- Translators: The application name -->
+  <name>Alacritty</name>
+  <project_license>APACHE-2.0</project_license>
+  <metadata_license>APACHE-2.0</metadata_license>
+  <!-- Translators: The application's summary / tagline -->
+  <summary>A fast, cross-platform, OpenGL terminal emulator</summary>
+  <description>
+    <p>
+      Alacritty is a modern terminal emulator that comes with sensible defaults,
+      but allows for extensive configuration. By integrating with other
+      applications, rather than reimplementing their functionality, it manages
+      to provide a flexible set of features with high performance.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://user-images.githubusercontent.com/8886672/103264352-5ab0d500-49a2-11eb-8961-02f7da66c855.png</image>
+      <caption>Alacritty - A fast, cross-platform, OpenGL terminal emulator</caption>
+    </screenshot>
+  </screenshots>
+  <keywords>
+    <keyword>terminal emulator</keyword>
+    <keyword>GPU</keyword>
+  </keywords>
+  <url type="homepage">https://github.com/alacritty/alacritty</url>
+  <url type="bugtracker">https://github.com/alacritty/alacritty/issues</url>
+  <update_contact>https://github.com/alacritty/alacritty/blob/master/CONTRIBUTING.md#contact</update_contact>
+  <developer_name>Christian Duerr</developer_name>
+</component>
diff --git a/extra/osx/Alacritty.app/Contents/Info.plist b/extra/osx/Alacritty.app/Contents/Info.plist
index 37ea41dc..593b9c6b 100644
--- a/extra/osx/Alacritty.app/Contents/Info.plist
+++ b/extra/osx/Alacritty.app/Contents/Info.plist
@@ -7,7 +7,7 @@
   <key>CFBundleExecutable</key>
   <string>alacritty</string>
   <key>CFBundleIdentifier</key>
-  <string>io.alacritty</string>
+  <string>org.alacritty</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
-- 
cgit