From 615727ee3e6ef8fd444a5673e772516864f97f4a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 23 Feb 2025 19:33:12 +0100
Subject: [PATCH] Fix kxstudio repos signing key, cleanup

Signed-off-by: falkTX <falktx@falktx.com>
---
 sources/.gitignore                            |   3 ++
 .../kxstudio/kxstudio-repos/debian/changelog  |   8 +++++
 .../debian/kxstudio-repos.install             |   4 +--
 .../debian/kxstudio-repos.postinst            |  12 +-------
 sources/kxstudio/kxstudio-repos/falktx.gpg    |  29 ------------------
 .../kxstudio-repos/kxstudio-debian.gpg        | Bin 610 -> 1156 bytes
 6 files changed, 14 insertions(+), 42 deletions(-)
 delete mode 100644 sources/kxstudio/kxstudio-repos/falktx.gpg

diff --git a/sources/.gitignore b/sources/.gitignore
index 1e6f8f8..90b05e2 100644
--- a/sources/.gitignore
+++ b/sources/.gitignore
@@ -4,9 +4,12 @@
 *.debian.*
 *.dsc
 *.orig.*
+*.substvars
 *.tar.*
 *.upload
 
+.debhelper/
+debhelper-build-stamp
 files
 
 /libs/*/*
diff --git a/sources/kxstudio/kxstudio-repos/debian/changelog b/sources/kxstudio/kxstudio-repos/debian/changelog
index 512c427..e20b05b 100644
--- a/sources/kxstudio/kxstudio-repos/debian/changelog
+++ b/sources/kxstudio/kxstudio-repos/debian/changelog
@@ -1,3 +1,11 @@
+kxstudio-repos (11.2.0) focal; urgency=medium
+
+  * Update signing key
+  * Remove old falktx key
+  * Cleanup postinst script
+
+ -- falkTX <falktx@falktx.com>  Sun, 23 Feb 2025 19:25:38 +0100
+
 kxstudio-repos (11.1.0) focal; urgency=medium
 
   * Remove old non-PPA repo
diff --git a/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.install b/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.install
index 091d60e..b33ad9e 100644
--- a/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.install
+++ b/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.install
@@ -1,2 +1,2 @@
-keyrings/*.gpg etc/apt/trusted.gpg.d/
-*.list         etc/apt/sources.list.d/
+*.gpg  etc/apt/trusted.gpg.d/
+*.list etc/apt/sources.list.d/
diff --git a/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.postinst b/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.postinst
index 84ff450..28aa894 100755
--- a/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.postinst
+++ b/sources/kxstudio/kxstudio-repos/debian/kxstudio-repos.postinst
@@ -40,12 +40,6 @@ deb http://ppa.launchpad.net/kxstudio-debian/kxstudio/ubuntu focal main
 " > /etc/apt/sources.list.d/kxstudio-debian-ppas-2.list
 fi
 
-if [ ! -f /etc/apt/sources.list.d/kxstudio-free.list ]; then
-  echo "deb [arch=amd64,i386] https://kx.studio/repo/ stable free
-deb [arch=amd64,i386] https://kx.studio/repo/ gcc5 free
-" > /etc/apt/sources.list.d/kxstudio-free.list
-fi
-
 ###########################################################################################
 # remove old stuff
 
@@ -56,16 +50,12 @@ rm -f /etc/apt/sources.list.d/kxstudio-debian.gcc5plus.list
 rm -f /etc/apt/sources.list.d/kxstudio-external.list
 rm -f /etc/apt/sources.list.d/kxstudio-free.list
 rm -f /etc/apt/sources.list.d/kxstudio-free.gcc5.list
-
-###########################################################################################
-# non-free repo is empty now
-
 rm -f /etc/apt/sources.list.d/kxstudio-non-free.list
 
 ###########################################################################################
 # Fix for Ubuntu version upgrades messing up stuff
 
-VERSIONS=("cosmic" "disco" "eoan" "focal" "impish" "jammy")
+VERSIONS=("cosmic" "disco" "eoan" "focal" "impish" "jammy" "kinetic" "lunar" "mantic" "noble" "oracular" "plucky")
 
 for VERSION in ${VERSIONS[@]}; do
   sed "s/ $VERSION / bionic /" -i /etc/apt/sources.list.d/kxstudio-debian-ppas.list
diff --git a/sources/kxstudio/kxstudio-repos/falktx.gpg b/sources/kxstudio/kxstudio-repos/falktx.gpg
deleted file mode 100644
index fb32164..0000000
--- a/sources/kxstudio/kxstudio-repos/falktx.gpg
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQGiBErcdzARBACdqZORzuU1suVtGouZKyuzR45FlTvDCa2xiiN+lJeP82ybtpKo
-nhM0J0b3yjebNbo8qwevWHdrb0i05g8RO235VVy6hCQHiTBwAFTm1XwtZ7iiZBvb
-y7qzHvtyFwjqh1X0Eb42bKW6STTTV3JQms0H9lCNDsa24FZS/LVNN79cFwCgnoyq
-ipr6oDeJZU8OXJy79dphTosD/RsWAHXhXB6ht5HcrMqobtgZ+aMElRSPNL+CqOsA
-Y0ize5vq69NE98kTRBu4kL4STtvRLfw3JipeF+XvBf9n5alPaX+0q8pBajXgUTVl
-QKi06GjFkI52KEGFO6oI8uZimfp2bUSI8t0JUWJSCAHNYpodqEhQn7FgDk/GFJMx
-xxiiA/9BuisUnqljsuSRr0tvkeWDBKRC7FTgE8w+eNQIv7B/rKr99W/xARm0ruJ2
-7feazPi6SqXxirwkwI32ZyDZng3RcMPCBGB5LKi5+hf/GpHnU6BRb5MFqF6mRed8
-AjwQHhhtCZ/GpQChfdliLVVS5XpH5YaWFkE/4XhYfL2I3UiFvbQZZmFsa1RYIDxm
-YWxrdHhAZ21haWwuY29tPohgBBMRAgAgBQJK3HcwAhsDBgsJCAcDAgQVAggDBBYC
-AwECHgECF4AACgkQLTRFqCkhODdsIwCfdh067cYe/HZialiji82VbKAn4q0AniOJ
-E4z5cXTfjsDVFYb+1GRxAl4uuQINBErcdzAQCACFNs2sjHrfzboRsuuhX4EDWXR2
-xoCgCL1HOepXa2QQ2YJbKzYWujNePjrywxOGN1zVFJ/cfmMcaMpce8Q87ECXqzk8
-4zpQbDBFPoaPL5ecom8v++wtSOx19FMVocM4MxgWmt/D7Qcs+TRPdh+85eqG/Sg9
-E+S/+yad1qkYihQufu7uhZXAkysOHwZo74zynjOwP5rJ7s0pPMYFzhE7M0WYJuqP
-e1bvuPahobp0Ry0+M9WOTW1eEGxYOPc3jsw6dT47pG1H6/N9kB+9b3TXDBH1k3oY
-catyg1/eieUQobhNzKB043ji3peKwu35cZMFWOENDq6VuJZp3hH05WqSNigvAAMF
-B/42r30hQt40zzDvEikNz7vyfGZa0Ayu22vo/VlksTZyYnofE7LndDNMTNPQ/tZd
-NulCduNpIyN3gP1KVooJyj8tBHz0QQeCg9a3or7dHuExif4q6xUBD8Pyq0UftHHW
-mOfBHLHEiPYRkGsq6eL2CK8vH7WpleSq0hmOEBe4nBecmVGi0ZR6bW0Z+fZpz2kc
-VproKKx3CejmaWratkO1e4Cbk4PZV7IKUmNcxEI9L4iQbqXPDlvmvHrcJLDuOWtO
-pFzTf+mF0X+1N79Q+l9Kgme/EL3pQAXZBY21oMGWh5dHblXA/IyzmEhw56xQ32td
-oDElrBA5FF+bhgTIWjQsn+bYiEkEGBECAAkFAkrcdzACGwwACgkQLTRFqCkhODdU
-pwCeIbfhjvpqaOMJr2MwyyJrFj72ntUAn3EEIHlB7qccUpSGT0dWoMHOPh27
-=JIX+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/sources/kxstudio/kxstudio-repos/kxstudio-debian.gpg b/sources/kxstudio/kxstudio-repos/kxstudio-debian.gpg
index 0d577c432d0e092eeeed515170cc982652431c55..97dbc40bec1ec48169c8ff6782aff4427b015335 100644
GIT binary patch
literal 1156
zcmV-~1bh3&!A%5aG>zK<5CESKL%l+c4hw+6RD_;kwiB5jwZIxL&P4mHHVA8DvpNF%
z_5p7*>qT9?N#{EGJ$--6PLZ6K8LZb5!`xz<CKeu${i!@dX<<8g@Gmg>1o}@-%<r`T
zSbu{f7?|3g#_^>wNTHGyzOynC{yK8oU7lZl;If8be*)iZV1X(Qkpb<6%qGb`d|_g7
zADBu((8IPcUS!wdCtWS~uZf7dt7q6(nakaizg+XGgPiBWA_{v<-3ba76td$=%pOjh
zDyaESANP)plJnOD_vuQ-3PBP)w!78oAroF+>$Pdo1PyWI@UQp7e#IkNAt!bc%Mn;g
z#U+n1uES&k)#Bh1VvZANIP29kNj?-~3s4i<cbo#xXw51!l>~bSbslOOn=SoZRBTl0
zgF_dt&@<R(zyI~Z9Y;A`h`pO%cXd<^b)UQb=#(N=>_N7yoxu#q2=}$p-)qIWRVF_y
zk-=Iq8u9<rJkQT<8I9OEb%94on_OB?z+?^}HD-ko*^!#dNn%^Gc0hJ$;V?TurjI70
z8*5@Z&DiGuSnz0z$H$PM5FOFBywIqF`>?W^u?>@KgL5U0KwSE$iGWH8S9p){13P_^
z1%j9c?atKv<p^f+U_JN#vF$78g_+ZR2_Afcx?oTzF?d=l*#dtSoRvF#+S%itUc=$x
z7s4yIM#16gwlM$^0RREbAxvR)ZewV0VPqgsP(dJOZ*m|@SW|R$WNB|8L}g-WVQ#{~
zjsz0{3II43Aq0sTTcR9X<Hswk910ATRygrrAKV23W;Bi40viJb3ke7Z0tOWd2?z@U
z1Qr4V0RkQY0vCV)3JDMll~y?MUmx6Li4XlBAL?TgRt>fX)uC5VJ64d32%hTwtW-H8
z0ba|MoPsQr+F+y5@{=YdLy|&;_f}ntz)SWc4376xqWfk5zhZ19rr<WNm%V&##E$aC
zx1qv!KaG_`)h%@;|C^u-ZqgPt1MqiU-6o=9W;3-P&F^uNJW-h)P^abjAMAh0M%|e>
zmCZOcTAv|&!1KJdi<B#KIy<2S<~#O7@Q`Fn!YRk2xgo{#Yr2`M9jl}VzsY<d4q*Xw
z_7UD-3BHl@s!~N^5B`S`?a16D+6fean$_=r=nW~As^T;(grH+sV;=lZS~CI+#qoRQ
zN0d<M;)_F+KAdg5)pN2e!w_F>l;q5@C*_y85XS>uhrt-`WCP@XCe1d4%vEDFTkM1G
z%v}CE?z}D5ow1EExH^{SSw7nmB{N!^Kg!RxRjfac9tz>7C|M^=`V0kO1=I)giQEoh
z%P9IJJ+e$mpGWBpF?(2h-L{dEfH_&F%{{v(=d6cOV|1kPJ8(x(K*wOnLJWNocNhHN
zjEmHgP(ewNyTbD*h6IvEg4pG#VEXWR&y2-I`E==oG^(e!w9rRa*K@TQ*^NgNgU`*h
zy0nJa9A)%jmyp!L@q7K=dke}}V(C3?_?=p*m6G{$m}DkplrXaAvu&Bz<kB;IvLW;3
W26eCl9}SKIwn$h}=uYVF@{sb5s3p_@

literal 610
zcmaKqNs^*K07dtlf@OCQ7K3O(N4UsLk}PCYNJMtbXbD)L44%HK`vCnS{_1W1;;mLc
zKuipW^@zuM6j}yiO?+md<s$R1T`^(N50|d}!;<#t5q1>c<Tp`de-VfB)}?*UzZs@6
z1Wb#EtV|dKD+fzdEFeA2nj`aT+t)v*H5UA0J&k#`%tGI{(y=o$KOB+nT>_5D>!>*S
z4<SFgs`#Z2QLQ{5dO0~r@1a<RnY0j2^@Bid`vf}topY}4yFK&o+imIP8nX^wQN}01
z+@&KoWTm4+|2(*Yg6(wjgqsy$;Fagw$9R9zhsHtONrg%Z0K^agA}|J>>-@C2CLgel
z5j;?gtGH1Y13%7meH3GI8x4HCots;ob{82!8-fa4;9-B<uCFf!)Pn}AVUIwjf$AJ0
zVC+#fV7)Rla4?FWMHK)hI%@JM-WaA@TT<B{053P4=myMG$0X*!JxISI%5Aaf$xtz0
zLXo@eyl8?i+2H4x>KCov+#*+Mr0{jANWycmkYx*#q~rcReIg<CHWe>AJ$=W7?+P{J
z1T>NpA8xwmC&v%u#5FUWw<Ub)@C#AP*5<5A7!7+SwJmYn40#(?TJPxNrkKO&n#@Sy
YOT}zx4t6_cM{ET%|N6j=_MdpZ0i24v4gdfE