From aca438721425e03cae23675ca5aac96d49e0e4c2 Mon Sep 17 00:00:00 2001
From: "Ward Nakchbandi (Cosmic Fusion)"
 <83735213+CosmicFusion@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:46:02 +0300
Subject: [PATCH]

---
 pika-sources/debian/changelog                               | 2 +-
 pika-sources/debian/postinst                                | 5 +++++
 pika-sources/debian/postrm                                  | 6 ------
 .../share/apt-pika}/apt/apt.conf.d/99steam-launcher         | 0
 .../share/apt-pika}/apt/keyrings/pika-keyring.gpg.key       | 0
 .../apt-pika}/apt/preferences.d/0-pika-radeon-settings      | 0
 .../apt-pika}/apt/preferences.d/1-pika-ubuntu-settings      | 0
 pika-sources/{etc => usr/share/apt-pika}/apt/sources.list   | 0
 .../share/apt-pika}/apt/sources.list.d/pika-main.sources    | 0
 .../share/apt-pika}/apt/sources.list.d/system.sources       | 0
 10 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 pika-sources/debian/postrm
 rename pika-sources/{etc => usr/share/apt-pika}/apt/apt.conf.d/99steam-launcher (100%)
 rename pika-sources/{etc => usr/share/apt-pika}/apt/keyrings/pika-keyring.gpg.key (100%)
 rename pika-sources/{etc => usr/share/apt-pika}/apt/preferences.d/0-pika-radeon-settings (100%)
 rename pika-sources/{etc => usr/share/apt-pika}/apt/preferences.d/1-pika-ubuntu-settings (100%)
 rename pika-sources/{etc => usr/share/apt-pika}/apt/sources.list (100%)
 rename pika-sources/{etc => usr/share/apt-pika}/apt/sources.list.d/pika-main.sources (100%)
 rename pika-sources/{etc => usr/share/apt-pika}/apt/sources.list.d/system.sources (100%)

diff --git a/pika-sources/debian/changelog b/pika-sources/debian/changelog
index 54bf518..4df13c4 100644
--- a/pika-sources/debian/changelog
+++ b/pika-sources/debian/changelog
@@ -1,4 +1,4 @@
-pika-sources (6.0-99pika3-lunar) lunar; urgency=low
+pika-sources (6.0-99pika4-lunar) lunar; urgency=low
 
   *  Switch to internal repos
 
diff --git a/pika-sources/debian/postinst b/pika-sources/debian/postinst
index 95fef60..2195312 100755
--- a/pika-sources/debian/postinst
+++ b/pika-sources/debian/postinst
@@ -2,6 +2,9 @@
 
 set -e
 
+rm -rf /etc/apt/sources.list.d/pika-* || true
+rm -rf /etc/apt/preferences.d/*pika* || true
+
 rm -f /etc/apt/sources.list.d/amdgpu.sources || true
 rm -f /etc/apt/sources.list.d/amdvlk.sources || true
 rm -f /etc/apt/sources.list.d/xtradeb-apps.sources || true
@@ -16,6 +19,8 @@ rm -f /etc/apt/preferences.d/51-ppa-default-settings || true
 rm -f /etc/apt/preferences.d/0-radeon-repo-settings || true
 rm -f /etc/apt/sources.list.d/kisak-mesa.sources || true
 
+cp -rf /usr/share/apt-pika/apt /etc/ || true
+
 systemctl enable --now steam-repos-fix.service || echo "steam-repos-fix service could not be enabled"
 
 mkdir -p /usr/share || echo "Path already exists!"
diff --git a/pika-sources/debian/postrm b/pika-sources/debian/postrm
deleted file mode 100644
index 2dc12e4..0000000
--- a/pika-sources/debian/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-rm -rf /etc/apt/sources.list.d/pika-* || true
-rm -rf /etc/apt/preferences.d/*pika* || true
\ No newline at end of file
diff --git a/pika-sources/etc/apt/apt.conf.d/99steam-launcher b/pika-sources/usr/share/apt-pika/apt/apt.conf.d/99steam-launcher
similarity index 100%
rename from pika-sources/etc/apt/apt.conf.d/99steam-launcher
rename to pika-sources/usr/share/apt-pika/apt/apt.conf.d/99steam-launcher
diff --git a/pika-sources/etc/apt/keyrings/pika-keyring.gpg.key b/pika-sources/usr/share/apt-pika/apt/keyrings/pika-keyring.gpg.key
similarity index 100%
rename from pika-sources/etc/apt/keyrings/pika-keyring.gpg.key
rename to pika-sources/usr/share/apt-pika/apt/keyrings/pika-keyring.gpg.key
diff --git a/pika-sources/etc/apt/preferences.d/0-pika-radeon-settings b/pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-radeon-settings
similarity index 100%
rename from pika-sources/etc/apt/preferences.d/0-pika-radeon-settings
rename to pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-radeon-settings
diff --git a/pika-sources/etc/apt/preferences.d/1-pika-ubuntu-settings b/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings
similarity index 100%
rename from pika-sources/etc/apt/preferences.d/1-pika-ubuntu-settings
rename to pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings
diff --git a/pika-sources/etc/apt/sources.list b/pika-sources/usr/share/apt-pika/apt/sources.list
similarity index 100%
rename from pika-sources/etc/apt/sources.list
rename to pika-sources/usr/share/apt-pika/apt/sources.list
diff --git a/pika-sources/etc/apt/sources.list.d/pika-main.sources b/pika-sources/usr/share/apt-pika/apt/sources.list.d/pika-main.sources
similarity index 100%
rename from pika-sources/etc/apt/sources.list.d/pika-main.sources
rename to pika-sources/usr/share/apt-pika/apt/sources.list.d/pika-main.sources
diff --git a/pika-sources/etc/apt/sources.list.d/system.sources b/pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources
similarity index 100%
rename from pika-sources/etc/apt/sources.list.d/system.sources
rename to pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources