From 50794960150b84f322b4954ffc82ac9621a1c98a Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (Cosmic Fusion)" <83735213+CosmicFusion@users.noreply.github.com> Date: Thu, 20 Apr 2023 21:18:39 +0300 Subject: [PATCH] update to lunar --- pika-sources/debian/changelog | 98 ------------------ .../etc/apt/sources.list.d/amdgpu.sources | 2 +- .../etc/apt/sources.list.d/amdvlk.sources | 2 +- .../etc/apt/sources.list.d/kisak-mesa.sources | 4 +- .../sources.list.d/kubuntu-backports.sources | 4 +- .../sources.list.d/mozillateam-ppa.sources | 4 +- .../apt/sources.list.d/pika-baseos.sources | 4 +- .../sources.list.d/pika-multimedia.sources | 4 +- .../etc/apt/sources.list.d/rocm.sources | 2 +- .../etc/apt/sources.list.d/steam.sources | 2 +- .../etc/apt/sources.list.d/system.sources | 2 +- .../etc/apt/sources.list.d/winehq.sources | 4 +- .../apt/sources.list.d/xtradeb-apps.sources | 4 +- .../apt/sources.list.d/xtradeb-play.sources | 4 +- .../apt/sources.list.d/xtradeb-repo.sources | 4 +- .../share => etc/apt}/keyrings/amdvlk.gpg.key | 0 .../apt}/keyrings/kisak-mesa.gpg.key | Bin .../apt}/keyrings/kubuntu-ppa.gpg.key | Bin .../keyrings/mozillateam-ubuntu-ppa.gpg.key | Bin .../apt}/keyrings/pika-keyring.gpg.key | 0 .../apt}/keyrings/pika-ppa-keyring.gpg.key | Bin .../etc/apt/keyrings/pipewire-debian.gpg | Bin 0 -> 1187 bytes .../apt}/keyrings/rocm-keyring.gpg.key | Bin .../apt}/keyrings/steam_pika.gpg.key | Bin .../apt}/keyrings/winehq-archive.key | 0 .../apt}/keyrings/xtradeb-ubuntu-apps.gpg.key | Bin .../apt}/keyrings/xtradeb-ubuntu-play.gpg.key | Bin .../etc/apt/sources.list.d/amdgpu.sources | 2 +- .../etc/apt/sources.list.d/amdvlk.sources | 2 +- .../etc/apt/sources.list.d/kisak-mesa.sources | 4 +- .../sources.list.d/kubuntu-backports.sources | 4 +- .../sources.list.d/mozillateam-ppa.sources | 4 +- .../etc/apt/sources.list.d/pika-apt.sources | 4 +- .../apt/sources.list.d/pika-launchpad.sources | 4 +- .../sources.list.d/pipewire-upstream.sources | 7 ++ .../etc/apt/sources.list.d/rocm.sources | 2 +- .../etc/apt/sources.list.d/steam.sources | 2 +- .../etc/apt/sources.list.d/system.sources | 2 +- .../etc/apt/sources.list.d/winehq.sources | 4 +- .../wireplumer-upstream.sources | 7 ++ .../apt/sources.list.d/xtradeb-apps.sources | 4 +- .../apt/sources.list.d/xtradeb-play.sources | 4 +- .../apt/sources.list.d/xtradeb-repo.sources | 8 -- .../usr/share/keyrings/xtradeb.asc.key | 52 ---------- release.sh | 4 +- 45 files changed, 60 insertions(+), 204 deletions(-) delete mode 100644 pika-sources/debian/changelog rename pika-sources/{usr/share => etc/apt}/keyrings/amdvlk.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/kisak-mesa.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/kubuntu-ppa.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/mozillateam-ubuntu-ppa.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/pika-keyring.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/pika-ppa-keyring.gpg.key (100%) create mode 100644 pika-sources/etc/apt/keyrings/pipewire-debian.gpg rename pika-sources/{usr/share => etc/apt}/keyrings/rocm-keyring.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/steam_pika.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/winehq-archive.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/xtradeb-ubuntu-apps.gpg.key (100%) rename pika-sources/{usr/share => etc/apt}/keyrings/xtradeb-ubuntu-play.gpg.key (100%) create mode 100644 pika-sources/etc/apt/sources.list.d/pipewire-upstream.sources create mode 100644 pika-sources/etc/apt/sources.list.d/wireplumer-upstream.sources delete mode 100644 pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources delete mode 100644 pika-sources/usr/share/keyrings/xtradeb.asc.key diff --git a/pika-sources/debian/changelog b/pika-sources/debian/changelog deleted file mode 100644 index a80a4a5..0000000 --- a/pika-sources/debian/changelog +++ /dev/null @@ -1,98 +0,0 @@ -pika-sources (4.0-99pika5) kinetic; urgency=low - - * Link mirrors - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (4.0-99pika4) kinetic; urgency=high - - * Fix steam breaking apt updates - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (4.0-99pika3) kinetic; urgency=low - - * Link mirrors - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (4.0-99pika2) kinetic; urgency=low - - * Add kubuntu ppa priority override - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (4.0-99pika1) kinetic; urgency=low - - * Move to new repos - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (3.0-99pika18) kinetic; urgency=low - - * Fix breakages - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (3.0-99pika17) kinetic; urgency=low - - * Add sources fix script - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (3.0-99pika15) kinetic; urgency=low - - * Move keys to /usr/share/keyrings - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (3.0-99pika14) kinetic; urgency=low - - * Revert last commit - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (3.0-99pika13) kinetic; urgency=low - - * Add update post scripts for ISO - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - - -pika-sources (3.0-99pika12) kinetic; urgency=low - - * Fix PPA priorities typo and add KDE-Backports - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (3.0-99pika11) kinetic; urgency=low - - * Switch Steam Repos fix to systemd service - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - - -pika-sources (3.0-99pika10) kinetic; urgency=low - - * Steam Repos fix again - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - - -pika-sources (1.0-99pika4) kinetic; urgency=low - - * Steam Repos fix - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (1.0-99pika2) kinetic; urgency=low - - * Change Steam GPG - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 - -pika-sources (1.0-99pika1) kinetic; urgency=low - - * Initial Creation - - -- Ward Nakchbandi Sat, 01 Oct 2022 14:50:00 +0200 diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdgpu.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdgpu.sources index 5996a75..8fa8c09 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdgpu.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdgpu.sources @@ -4,4 +4,4 @@ Types: deb deb-src URIs: https://repo.radeon.com/amdgpu/5.4.1/ubuntu Suites: jammy Components: main proprietary -Signed-By: /usr/share/keyrings/rocm-keyring.gpg.key +Signed-By: /etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdvlk.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdvlk.sources index 6e5ebe9..67b67b4 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdvlk.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/amdvlk.sources @@ -4,4 +4,4 @@ Types: deb URIs: https://repo.radeon.com/amdvlk/apt/debian Suites: bionic Components: main -Signed-By: /usr/share/keyrings/amdvlk.gpg.key +Signed-By: /etc/apt/keyrings/amdvlk.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources index c26662c..35ccac5 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources @@ -2,6 +2,6 @@ X-Repolib-Name: Kisak Fresh Mesa (Graphics Drivers) Enabled: yes Types: deb deb-src URIs: http://ppa.launchpad.net/kisak/kisak-mesa/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/kisak-mesa.gpg.key +Signed-By: /etc/apt/keyrings/kisak-mesa.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources index 3d24370..d6b6004 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources @@ -2,6 +2,6 @@ X-Repolib-Name: Kubuntu KDE Backports Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/kubuntu-ppa/backports/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/kubuntu-ppa.gpg.key +Signed-By: /etc/apt/keyrings/kubuntu-ppa.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources index 3adaa43..297eedb 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources @@ -2,6 +2,6 @@ X-Repolib-Name: Official Mozilla Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/mozillateam-ubuntu-ppa.gpg.key +Signed-By: /etc/apt/keyrings/mozillateam-ubuntu-ppa.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-baseos.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-baseos.sources index c1dfc5e..38254da 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-baseos.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-baseos.sources @@ -2,6 +2,6 @@ X-Repolib-Name: PikaOS BaseOS Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/pikaos/baseos/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/pika-keyring.gpg.key +Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-multimedia.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-multimedia.sources index 7b28716..c69d584 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-multimedia.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/pika-multimedia.sources @@ -2,6 +2,6 @@ X-Repolib-Name: PikaOS Multimedia Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/pikaos/multimedia/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/pika-keyring.gpg.key +Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/rocm.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/rocm.sources index 548b842..d434434 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/rocm.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/rocm.sources @@ -5,4 +5,4 @@ URIs: https://repo.radeon.com/rocm/apt/5.4.3 Suites: jammy Components: main Architectures: amd64 -Signed-By: /usr/share/keyrings/rocm-keyring.gpg.key +Signed-By: /etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/steam.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/steam.sources index 75f5b26..9282921 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/steam.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/steam.sources @@ -5,4 +5,4 @@ URIs: http://repo.steampowered.com/steam Suites: stable Components: steam Architectures: amd64 i386 -Signed-By: /usr/share/keyrings/steam_pika.gpg.key +Signed-By: /etc/apt/keyrings/steam_pika.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/system.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/system.sources index b4b1bd1..575a705 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/system.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/system.sources @@ -2,7 +2,7 @@ X-Repolib-Name: Ubuntu System Sources Enabled: yes Types: deb deb-src URIs: http://archive.ubuntu.com/ubuntu/ -Suites: kinetic kinetic-security kinetic-updates kinetic-backports kinetic-proposed +Suites: lunar lunar-security lunar-updates lunar-backports lunar-proposed Components: main restricted universe multiverse X-Repolib-ID: system X-Repolib-Default-Mirror: http://archive.ubuntu.com/ubuntu/ diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/winehq.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/winehq.sources index 3116b37..dc00c72 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/winehq.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/winehq.sources @@ -2,7 +2,7 @@ X-Repolib-Name: Official WineHQ Sources Enabled: yes Types: deb deb-src URIs: https://dl.winehq.org/wine-builds/ubuntu -Suites: kinetic +Suites: lunar Components: main Architectures: amd64 i386 -Signed-By: /usr/share/keyrings/winehq-archive.key +Signed-By: /etc/apt/keyrings/winehq-archive.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources index dfccfea..f8f92b5 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources @@ -2,6 +2,6 @@ X-Repolib-Name: XtraDeb Apps PPA Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/xtradeb-ubuntu-apps.gpg.key +Signed-By: /etc/apt/keyrings/xtradeb-ubuntu-apps.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources index 8db40b4..52b519a 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources @@ -2,6 +2,6 @@ X-Repolib-Name: XtraDeb Play PPA Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/xtradeb/play/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/xtradeb-ubuntu-play.gpg.key +Signed-By: /etc/apt/keyrings/xtradeb-ubuntu-play.gpg.key diff --git a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources index aabd270..d6197fb 100644 --- a/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources +++ b/pika-sources/debian/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources @@ -2,7 +2,7 @@ X-Repolib-Name: XtraDeb Repo Sources Enabled: yes Types: deb URIs: https://packages.xtradeb.net/ubuntu -Suites: kinetic +Suites: lunar Components: apps play Architectures: amd64 -Signed-By: /usr/share/keyrings/xtradeb.asc.key +Signed-By: /etc/apt/keyrings/xtradeb.asc.key diff --git a/pika-sources/usr/share/keyrings/amdvlk.gpg.key b/pika-sources/etc/apt/keyrings/amdvlk.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/amdvlk.gpg.key rename to pika-sources/etc/apt/keyrings/amdvlk.gpg.key diff --git a/pika-sources/usr/share/keyrings/kisak-mesa.gpg.key b/pika-sources/etc/apt/keyrings/kisak-mesa.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/kisak-mesa.gpg.key rename to pika-sources/etc/apt/keyrings/kisak-mesa.gpg.key diff --git a/pika-sources/usr/share/keyrings/kubuntu-ppa.gpg.key b/pika-sources/etc/apt/keyrings/kubuntu-ppa.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/kubuntu-ppa.gpg.key rename to pika-sources/etc/apt/keyrings/kubuntu-ppa.gpg.key diff --git a/pika-sources/usr/share/keyrings/mozillateam-ubuntu-ppa.gpg.key b/pika-sources/etc/apt/keyrings/mozillateam-ubuntu-ppa.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/mozillateam-ubuntu-ppa.gpg.key rename to pika-sources/etc/apt/keyrings/mozillateam-ubuntu-ppa.gpg.key diff --git a/pika-sources/usr/share/keyrings/pika-keyring.gpg.key b/pika-sources/etc/apt/keyrings/pika-keyring.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/pika-keyring.gpg.key rename to pika-sources/etc/apt/keyrings/pika-keyring.gpg.key diff --git a/pika-sources/usr/share/keyrings/pika-ppa-keyring.gpg.key b/pika-sources/etc/apt/keyrings/pika-ppa-keyring.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/pika-ppa-keyring.gpg.key rename to pika-sources/etc/apt/keyrings/pika-ppa-keyring.gpg.key diff --git a/pika-sources/etc/apt/keyrings/pipewire-debian.gpg b/pika-sources/etc/apt/keyrings/pipewire-debian.gpg new file mode 100644 index 0000000000000000000000000000000000000000..1adb2c61d4094a5a5a20c018ce429fd99fa4508d GIT binary patch literal 1187 zcmV;U1YG->0u2OUgae%c5CEr^jF=Pkus~uS=G#nJ@G z)C|{Xc*Dn9)Zj8x9HqjkQUP1dL7QtzWbqB*L37S`UJ5J3qoi{(<_z!%1c=_@&y#{m z)Z93o=FZ31=MxQfI_!!7t0o#2)XK?IwWfbYr+94dQ zQi#C$Axsb%lbfFj**Svl13_^EWfvF7go=#T6me@5J_!fPgj{r za4G-%VWcsWC@bvAu4@2}o~yUZR1ZUuF=EUr(rYaRMzXetaXKfzd91upG0V%f?jjaE z6)f1=qZ6=rEMDlvQE0RRE83;+OUaAyGk000000JI!TVRdd}XmDXx$geKzizNt(16hD| zmIVS}gae%d8v_Lk2?z%Q1{Dek2nzxP76JnS0v-VZ7k~f?2@oX+iUV1Ib(VV+5B(q2 zp5buOED)&Xpx6RrX$B~=&FNf(mPFuTQ#7&xg??Fx4}oa37N<5~K=2X{!`lpx7W#g& z%8aV45^afzl=Xavd`T%_4svUApOkNtP8`)>G?gn(vTA4u`vM5l+DSufhWfaf{7p7N z&|%u|nc#&6Sjb72>FUhc&k{-tZR2c0r(!J}RFD2-N?z)|+Yn-G>as3w5j5B?5eNzQw;X{!`g;NHZHuEl&`){ppsa{i#3&5i%QlrAZxqr7WTWYP+njti>Sc`Qv}%A;qvP{Y?6c-oMIl)X|7!Yf(8v<*r>I|kT44rKa1`TD82 zL$mRQ%1Hvt+7wc5+fPa-@wknzd)NmVL@>p|*eMw;lXJNUTUa7(PsJQ+aNw*+2FI>{ zKw&RGalOi-98I;&c7-s4uo*M0%dQ!jz!D`+Ct@3o%D4MPj6_hVq{@$vl_7t z0uAHW^94fW?t7E%O}@u=Rw3l^Vt%!;hn)giM6ez74^oikJTJqo`Vg=N00U=mX8^m8 B7&8C> literal 0 HcmV?d00001 diff --git a/pika-sources/usr/share/keyrings/rocm-keyring.gpg.key b/pika-sources/etc/apt/keyrings/rocm-keyring.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/rocm-keyring.gpg.key rename to pika-sources/etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/usr/share/keyrings/steam_pika.gpg.key b/pika-sources/etc/apt/keyrings/steam_pika.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/steam_pika.gpg.key rename to pika-sources/etc/apt/keyrings/steam_pika.gpg.key diff --git a/pika-sources/usr/share/keyrings/winehq-archive.key b/pika-sources/etc/apt/keyrings/winehq-archive.key similarity index 100% rename from pika-sources/usr/share/keyrings/winehq-archive.key rename to pika-sources/etc/apt/keyrings/winehq-archive.key diff --git a/pika-sources/usr/share/keyrings/xtradeb-ubuntu-apps.gpg.key b/pika-sources/etc/apt/keyrings/xtradeb-ubuntu-apps.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/xtradeb-ubuntu-apps.gpg.key rename to pika-sources/etc/apt/keyrings/xtradeb-ubuntu-apps.gpg.key diff --git a/pika-sources/usr/share/keyrings/xtradeb-ubuntu-play.gpg.key b/pika-sources/etc/apt/keyrings/xtradeb-ubuntu-play.gpg.key similarity index 100% rename from pika-sources/usr/share/keyrings/xtradeb-ubuntu-play.gpg.key rename to pika-sources/etc/apt/keyrings/xtradeb-ubuntu-play.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/amdgpu.sources b/pika-sources/etc/apt/sources.list.d/amdgpu.sources index 4d27017..ffe87b6 100644 --- a/pika-sources/etc/apt/sources.list.d/amdgpu.sources +++ b/pika-sources/etc/apt/sources.list.d/amdgpu.sources @@ -4,4 +4,4 @@ Types: deb deb-src URIs: https://repo.radeon.com/amdgpu/5.4.3/ubuntu Suites: jammy Components: main proprietary -Signed-By: /usr/share/keyrings/rocm-keyring.gpg.key +Signed-By: /etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/amdvlk.sources b/pika-sources/etc/apt/sources.list.d/amdvlk.sources index 6e5ebe9..67b67b4 100644 --- a/pika-sources/etc/apt/sources.list.d/amdvlk.sources +++ b/pika-sources/etc/apt/sources.list.d/amdvlk.sources @@ -4,4 +4,4 @@ Types: deb URIs: https://repo.radeon.com/amdvlk/apt/debian Suites: bionic Components: main -Signed-By: /usr/share/keyrings/amdvlk.gpg.key +Signed-By: /etc/apt/keyrings/amdvlk.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources b/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources index c26662c..35ccac5 100644 --- a/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources +++ b/pika-sources/etc/apt/sources.list.d/kisak-mesa.sources @@ -2,6 +2,6 @@ X-Repolib-Name: Kisak Fresh Mesa (Graphics Drivers) Enabled: yes Types: deb deb-src URIs: http://ppa.launchpad.net/kisak/kisak-mesa/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/kisak-mesa.gpg.key +Signed-By: /etc/apt/keyrings/kisak-mesa.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources b/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources index 3d24370..d6b6004 100644 --- a/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources +++ b/pika-sources/etc/apt/sources.list.d/kubuntu-backports.sources @@ -2,6 +2,6 @@ X-Repolib-Name: Kubuntu KDE Backports Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/kubuntu-ppa/backports/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/kubuntu-ppa.gpg.key +Signed-By: /etc/apt/keyrings/kubuntu-ppa.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources b/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources index 3adaa43..297eedb 100644 --- a/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources +++ b/pika-sources/etc/apt/sources.list.d/mozillateam-ppa.sources @@ -2,6 +2,6 @@ X-Repolib-Name: Official Mozilla Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/mozillateam-ubuntu-ppa.gpg.key +Signed-By: /etc/apt/keyrings/mozillateam-ubuntu-ppa.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-apt.sources b/pika-sources/etc/apt/sources.list.d/pika-apt.sources index 7e5acea..ac478b1 100644 --- a/pika-sources/etc/apt/sources.list.d/pika-apt.sources +++ b/pika-sources/etc/apt/sources.list.d/pika-apt.sources @@ -2,6 +2,6 @@ X-Repolib-Name: PikaOS APT Sources Enabled: yes Types: deb deb-src URIs: https://ppa.pika-os.com/ -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/pika-keyring.gpg.key +Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources b/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources index 17a7c01..ff1f506 100644 --- a/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources +++ b/pika-sources/etc/apt/sources.list.d/pika-launchpad.sources @@ -2,6 +2,6 @@ X-Repolib-Name: PikaOS Launchpad Sources Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/pikaos/pika/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/pika-ppa-keyring.gpg.key +Signed-By: /etc/apt/keyrings/pika-ppa-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/pipewire-upstream.sources b/pika-sources/etc/apt/sources.list.d/pipewire-upstream.sources new file mode 100644 index 0000000..5a254b5 --- /dev/null +++ b/pika-sources/etc/apt/sources.list.d/pipewire-upstream.sources @@ -0,0 +1,7 @@ +X-Repolib-Name: Pipewire Upstream Sources +Enabled: yes +Types: deb deb-src +URIs: https://ppa.launchpadcontent.net/pipewire-debian/pipewire-upstream/ubuntu +Suites: devel +Components: main +Signed-By: /etc/apt/keyrings/pipewire-debian.gpg diff --git a/pika-sources/etc/apt/sources.list.d/rocm.sources b/pika-sources/etc/apt/sources.list.d/rocm.sources index 548b842..d434434 100644 --- a/pika-sources/etc/apt/sources.list.d/rocm.sources +++ b/pika-sources/etc/apt/sources.list.d/rocm.sources @@ -5,4 +5,4 @@ URIs: https://repo.radeon.com/rocm/apt/5.4.3 Suites: jammy Components: main Architectures: amd64 -Signed-By: /usr/share/keyrings/rocm-keyring.gpg.key +Signed-By: /etc/apt/keyrings/rocm-keyring.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/steam.sources b/pika-sources/etc/apt/sources.list.d/steam.sources index 75f5b26..9282921 100644 --- a/pika-sources/etc/apt/sources.list.d/steam.sources +++ b/pika-sources/etc/apt/sources.list.d/steam.sources @@ -5,4 +5,4 @@ URIs: http://repo.steampowered.com/steam Suites: stable Components: steam Architectures: amd64 i386 -Signed-By: /usr/share/keyrings/steam_pika.gpg.key +Signed-By: /etc/apt/keyrings/steam_pika.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/system.sources b/pika-sources/etc/apt/sources.list.d/system.sources index b4b1bd1..575a705 100644 --- a/pika-sources/etc/apt/sources.list.d/system.sources +++ b/pika-sources/etc/apt/sources.list.d/system.sources @@ -2,7 +2,7 @@ X-Repolib-Name: Ubuntu System Sources Enabled: yes Types: deb deb-src URIs: http://archive.ubuntu.com/ubuntu/ -Suites: kinetic kinetic-security kinetic-updates kinetic-backports kinetic-proposed +Suites: lunar lunar-security lunar-updates lunar-backports lunar-proposed Components: main restricted universe multiverse X-Repolib-ID: system X-Repolib-Default-Mirror: http://archive.ubuntu.com/ubuntu/ diff --git a/pika-sources/etc/apt/sources.list.d/winehq.sources b/pika-sources/etc/apt/sources.list.d/winehq.sources index 3116b37..dc00c72 100644 --- a/pika-sources/etc/apt/sources.list.d/winehq.sources +++ b/pika-sources/etc/apt/sources.list.d/winehq.sources @@ -2,7 +2,7 @@ X-Repolib-Name: Official WineHQ Sources Enabled: yes Types: deb deb-src URIs: https://dl.winehq.org/wine-builds/ubuntu -Suites: kinetic +Suites: lunar Components: main Architectures: amd64 i386 -Signed-By: /usr/share/keyrings/winehq-archive.key +Signed-By: /etc/apt/keyrings/winehq-archive.key diff --git a/pika-sources/etc/apt/sources.list.d/wireplumer-upstream.sources b/pika-sources/etc/apt/sources.list.d/wireplumer-upstream.sources new file mode 100644 index 0000000..f92e73b --- /dev/null +++ b/pika-sources/etc/apt/sources.list.d/wireplumer-upstream.sources @@ -0,0 +1,7 @@ +X-Repolib-Name: Wireplumer Upstream Sources +Enabled: yes +Types: deb deb-src +URIs: https://ppa.launchpadcontent.net/pipewire-debian/wireplumber-upstream/ubuntu +Suites: devel +Components: main +Signed-By: /etc/apt/keyrings/pipewire-debian.gpg diff --git a/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources b/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources index dfccfea..f8f92b5 100644 --- a/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources +++ b/pika-sources/etc/apt/sources.list.d/xtradeb-apps.sources @@ -2,6 +2,6 @@ X-Repolib-Name: XtraDeb Apps PPA Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/xtradeb-ubuntu-apps.gpg.key +Signed-By: /etc/apt/keyrings/xtradeb-ubuntu-apps.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources b/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources index 8db40b4..52b519a 100644 --- a/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources +++ b/pika-sources/etc/apt/sources.list.d/xtradeb-play.sources @@ -2,6 +2,6 @@ X-Repolib-Name: XtraDeb Play PPA Enabled: yes Types: deb deb-src URIs: https://ppa.launchpadcontent.net/xtradeb/play/ubuntu -Suites: kinetic +Suites: lunar Components: main -Signed-By: /usr/share/keyrings/xtradeb-ubuntu-play.gpg.key +Signed-By: /etc/apt/keyrings/xtradeb-ubuntu-play.gpg.key diff --git a/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources b/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources deleted file mode 100644 index aabd270..0000000 --- a/pika-sources/etc/apt/sources.list.d/xtradeb-repo.sources +++ /dev/null @@ -1,8 +0,0 @@ -X-Repolib-Name: XtraDeb Repo Sources -Enabled: yes -Types: deb -URIs: https://packages.xtradeb.net/ubuntu -Suites: kinetic -Components: apps play -Architectures: amd64 -Signed-By: /usr/share/keyrings/xtradeb.asc.key diff --git a/pika-sources/usr/share/keyrings/xtradeb.asc.key b/pika-sources/usr/share/keyrings/xtradeb.asc.key deleted file mode 100644 index e21337f..0000000 --- a/pika-sources/usr/share/keyrings/xtradeb.asc.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -ZPUnLEldIruo160uSWW+FRRWsWI= -=yDxR ------END PGP PUBLIC KEY BLOCK----- diff --git a/release.sh b/release.sh index adec703..e057b02 100755 --- a/release.sh +++ b/release.sh @@ -5,10 +5,10 @@ dpkg-sig --sign builder ./output/pika-sources*.deb rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo # Remove our existing package from the repo -reprepro -V --basedir ./output/repo/ removefilter kinetic 'Package (% pika-sources*)' +reprepro -V --basedir ./output/repo/ removefilter lunar 'Package (% pika-sources*)' # Add the new package to the repo -reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/pika-sources*.deb +reprepro -V --basedir ./output/repo/ includedeb lunar ./output/pika-sources*.deb # Push the updated ppa repo to the server rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/