From dc39c68389c46f477e8ec9a883e6bf8dc5521150 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Thu, 28 Aug 2025 16:04:47 -0700
Subject: [PATCH] Modernize APT configuration format.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 package.json                   | 4 ++--
 packaging/deb-after-install.sh | 3 +++
 packaging/deb-apt.list         | 1 -
 packaging/deb-apt.sources      | 5 +++++
 4 files changed, 10 insertions(+), 3 deletions(-)
 delete mode 100644 packaging/deb-apt.list
 create mode 100644 packaging/deb-apt.sources

diff --git a/package.json b/package.json
index 7f526c38..563bb7da 100644
--- a/package.json
+++ b/package.json
@@ -89,8 +89,8 @@
       "synopsis": "Zulip Desktop App",
       "afterInstall": "./packaging/deb-after-install.sh",
       "fpm": [
-        "./packaging/deb-apt.list=/etc/apt/sources.list.d/zulip-desktop.list",
-        "./packaging/deb-apt.asc=/etc/apt/trusted.gpg.d/zulip-desktop.asc",
+        "./packaging/deb-apt.sources=/etc/apt/sources.list.d/zulip-desktop.sources",
+        "./packaging/deb-apt.asc=/usr/share/keyrings/zulip-desktop.asc",
         "./packaging/deb-release-upgrades.cfg=/etc/update-manager/release-upgrades.d/zulip-desktop.cfg"
       ]
     },
diff --git a/packaging/deb-after-install.sh b/packaging/deb-after-install.sh
index 0cbbd731..be27576f 100644
--- a/packaging/deb-after-install.sh
+++ b/packaging/deb-after-install.sh
@@ -11,3 +11,6 @@ update-desktop-database /usr/share/applications || true
 
 # Clean up configuration for old Bintray repository
 rm -f /etc/apt/zulip.list
+
+# Clean up legacy APT configuration
+rm -f /etc/apt/sources.list.d/zulip-desktop.list /etc/apt/trusted.gpg.d/zulip-desktop.asc
diff --git a/packaging/deb-apt.list b/packaging/deb-apt.list
deleted file mode 100644
index 2da681d9..00000000
--- a/packaging/deb-apt.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://download.zulip.com/desktop/apt stable main
diff --git a/packaging/deb-apt.sources b/packaging/deb-apt.sources
new file mode 100644
index 00000000..5835bdbb
--- /dev/null
+++ b/packaging/deb-apt.sources
@@ -0,0 +1,5 @@
+Types: deb
+URIs: https://download.zulip.com/desktop/apt/
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/zulip-desktop.asc