From efdcaab2c46cdc717087ae17a514cca9f88d4129 Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Sun, 11 Aug 2024 23:30:44 +0300
Subject: [PATCH] fix i386 overwrite and intel problems

---
 .github/release-nest-v3                                         | 2 +-
 .../share/apt-pika/{ => etc}/apt/apt.conf.d/99steam-launcher    | 0
 .../share/apt-pika/{ => etc}/apt/keyrings/pika-keyring.gpg.key  | 0
 .../apt-pika/{ => etc}/apt/preferences.d/0-pika-apt-settings    | 2 +-
 pika-sources/usr/share/apt-pika/{ => etc}/apt/sources.list      | 0
 .../share/apt-pika/{ => etc}/apt/sources.list.d/system.sources  | 0
 .../usr/share/apt-pika/etc/dpkg/dpkg.cfg.d/force-overwrite      | 1 +
 7 files changed, 3 insertions(+), 2 deletions(-)
 rename pika-sources/usr/share/apt-pika/{ => etc}/apt/apt.conf.d/99steam-launcher (100%)
 rename pika-sources/usr/share/apt-pika/{ => etc}/apt/keyrings/pika-keyring.gpg.key (100%)
 rename pika-sources/usr/share/apt-pika/{ => etc}/apt/preferences.d/0-pika-apt-settings (98%)
 rename pika-sources/usr/share/apt-pika/{ => etc}/apt/sources.list (100%)
 rename pika-sources/usr/share/apt-pika/{ => etc}/apt/sources.list.d/system.sources (100%)
 create mode 100755 pika-sources/usr/share/apt-pika/etc/dpkg/dpkg.cfg.d/force-overwrite

diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index 56a6051..0cfbf08 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-1
\ No newline at end of file
+2
diff --git a/pika-sources/usr/share/apt-pika/apt/apt.conf.d/99steam-launcher b/pika-sources/usr/share/apt-pika/etc/apt/apt.conf.d/99steam-launcher
similarity index 100%
rename from pika-sources/usr/share/apt-pika/apt/apt.conf.d/99steam-launcher
rename to pika-sources/usr/share/apt-pika/etc/apt/apt.conf.d/99steam-launcher
diff --git a/pika-sources/usr/share/apt-pika/apt/keyrings/pika-keyring.gpg.key b/pika-sources/usr/share/apt-pika/etc/apt/keyrings/pika-keyring.gpg.key
similarity index 100%
rename from pika-sources/usr/share/apt-pika/apt/keyrings/pika-keyring.gpg.key
rename to pika-sources/usr/share/apt-pika/etc/apt/keyrings/pika-keyring.gpg.key
diff --git a/pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-apt-settings b/pika-sources/usr/share/apt-pika/etc/apt/preferences.d/0-pika-apt-settings
similarity index 98%
rename from pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-apt-settings
rename to pika-sources/usr/share/apt-pika/etc/apt/preferences.d/0-pika-apt-settings
index b0ffb68..5a6118d 100644
--- a/pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-apt-settings
+++ b/pika-sources/usr/share/apt-pika/etc/apt/preferences.d/0-pika-apt-settings
@@ -26,7 +26,7 @@ Pin-Priority: 452
 # Lower pigeon's priority under cockatiel's
 Package: *
 Pin: release a=pika,c=pigeon
-Pin-Priority: 452
+Pin-Priority: 450
 
 # Blacklist intel mesa from pigeon
 Package: libglvnd0 libegl1 libegl-dev libglx0 libglx-dev libgl1 libgl-dev libglvnd-core-dev libgles1 libgles2 libgles-dev libglvnd-dev libopengl0 libopengl-dev libxatracker2 libgbm1 libgbm-dev *mesa*
diff --git a/pika-sources/usr/share/apt-pika/apt/sources.list b/pika-sources/usr/share/apt-pika/etc/apt/sources.list
similarity index 100%
rename from pika-sources/usr/share/apt-pika/apt/sources.list
rename to pika-sources/usr/share/apt-pika/etc/apt/sources.list
diff --git a/pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources b/pika-sources/usr/share/apt-pika/etc/apt/sources.list.d/system.sources
similarity index 100%
rename from pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources
rename to pika-sources/usr/share/apt-pika/etc/apt/sources.list.d/system.sources
diff --git a/pika-sources/usr/share/apt-pika/etc/dpkg/dpkg.cfg.d/force-overwrite b/pika-sources/usr/share/apt-pika/etc/dpkg/dpkg.cfg.d/force-overwrite
new file mode 100755
index 0000000..7a5794c
--- /dev/null
+++ b/pika-sources/usr/share/apt-pika/etc/dpkg/dpkg.cfg.d/force-overwrite
@@ -0,0 +1 @@
+force-overwrite