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 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 0d577c4..97dbc40 100644 Binary files a/sources/kxstudio/kxstudio-repos/kxstudio-debian.gpg and b/sources/kxstudio/kxstudio-repos/kxstudio-debian.gpg differ