Move apt repo to forgejo-contrib

8 files changed, 42 insertions, 35 deletions

diff --git a/repo-deb/build.sh b/repo-deb/build.sh
index e617404..4209a22 100755
--- a/repo-deb/build.sh
+++ b/repo-deb/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-cp code-forgejo-org-crystal.asc stub/
-cp code-forgejo-org-crystal.asc main/
+cp code-forgejo-org-forgejo-contrib.asc stub/
+cp code-forgejo-org-forgejo-contrib.asc main/
 cp forgejo-deb.list stub/
 cp forgejo-deb.list main/
 cd stub
diff --git a/repo-deb/code-forgejo-org-crystal.asc b/repo-deb/code-forgejo-org-crystal.asc
deleted file mode 100644
index e8ee1c5..0000000
--- a/repo-deb/code-forgejo-org-crystal.asc
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-xsBNBGSVbecBCADSrwa9TMkPb5LMC7Ts/6wDRUDkmO63uJLJ8eSTz2iurmN/gUuE
-GG65Pgkv+zqNENFga+nAJz4sTeAEMbUxxgPFKKdM5pdkYoSZ2iqsnH8/3nGeeNne
-7sE5i2ZbUKJwRFwBW8Oi8aecBcR7bxYPi2sdMcz93zYebrc23xhUEUA1tNdXU0SR
-+H7Wepq6MafWKYWpAWeAbRSGzB/jkc7rEur9CwvgEfuvKIpn6dvjbPVZdC8gUzJb
-+nBAqCWvzU28+ByWioRpmMmPwCVjxDlwhZNZfNkme3i9PuIHDqWCID+kfPMqDxLe
-BX4lJhrIBkzNXEyrCBxI6f00fstMblx05QqhABEBAAHNM0Zvcmdlam86IEJleW9u
-ZCBjb2RpbmcuIFdlIGZvcmdlLiAoRGViaWFuIFJlZ2lzdHJ5KcLAYgQTAQgAFgUC
-ZJVt5wkQFppua1ziWCACGwMCGQEAAC3YCAAIfjy3U2+OX1QWB2hYnuF1eRtrJhwu
-oioH0gVoyOfwqMG3bJhN0iKZ2kDAUwMWe9QdneRIvZPYtVQqn52QB0tIljeZDwHA
-c+62pNu4227pR51gF34CDguMMZuzLFMFmaASfP/7Ygb+Q1upSCKq++K9ZKgitlcz
-zGp4Sp6RBG8ELh3wNrSNYs1ZYWw6NdA+ayy+P7P5Hy9JSVjL1qlttE8Zn1WQFm5L
-LuGnhu0fTrtSKZa7+yIv6q4eNyKauJlcllANr51lgujcLjob8T7TLPrIpjLODGB3
-dRqF6Mdn3UXNXv2twVqLVKuzaRSwT9H/J4oaFpuvOv2EJpECawNOe8PIzsBNBGSV
-becBCACpoCecK1oT++JiFuRloEgpGQW2QiD6IWk0kpqCSt5qzPAGu1CCyRoQUTfX
-jS/ClwIM0YRdowgeuLcNRk+0jFjFGKPa5zRXXxuq1ZBMUKLQ7I0VUGKN4UqLQ6OU
-kIrSknL75IiwnOsMoKXU9QPr/fzQlh0lLNfjL3FOmh16/QoWcTnSWZjhGvwkFFx4
-4T3mpeD2Y+Lsx8Psi4ZORv+ODxsb0piRUEIe2nq2Uav9Qj9YLd+rzenG0qcTN46A
-oqwumuUBRxGn2WWkTf1ZnTWS36WDw1bWEzgwvvlz7NRwEXg16SBwbR/9bnWx359h
-AaWBy3A1c3hBaQLPXzCpQnasbMAdABEBAAHCwF8EGAEIABMFAmSVbecJEBaabmtc
-4lggAhsMAACWcwgALSpBKXv4SX2VAVCo1GKUO8FT/dpgAP6u788fdorQBlS7TUTz
-wqEB/wVuSjOER04DdOOXH5up9ikZhaTa03uL4UXeHsPL9qaUQ+Y1Avn8FHpR3647
-O+f0+iEiROtNfLuNWNYISHwJB644m2xsMG9bohLU2h78yS0ToZlt5hvoTpTNKO1g
-9lUM7u2i5DBDBQnUBfp6nKou9gMH2CHgB4W4Gc36b7sgU7AQt095yfbfdIjaHl7a
-wikaAx/cMShI0lJudDs60qUfxfKfEQBcexJMiEiZbF6dPzQ6OQm9lcmkuhNAX6MP
-zuNnZsilht/BDYeKWqmwdfXFxcdZ/BX/oitwkA==
-=hNbH
------END PGP PUBLIC KEY BLOCK-----
diff --git a/repo-deb/code-forgejo-org-forgejo-contrib.asc b/repo-deb/code-forgejo-org-forgejo-contrib.asc
new file mode 100644
index 0000000..fe21f5b
--- /dev/null
+++ b/repo-deb/code-forgejo-org-forgejo-contrib.asc
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xsBNBGS/s68BCACv7kWy8EHmOHzQ0hjZ9far6U16/9egyJ1amCXHJj755glbuFD0
+aXeCjnp8p6Dghjz2a4fNkmeJhpgQGW7aN7SUFXa7TDW6/aoeNuvHl9ll7ZjUrovV
+jihPkPFrSAfbDIsXnM75psaxWnRgVhNtQ/qdFoTtYgsKmExKmBN0wgs6MV3355i5
+/WwgADDJHFFaCcx+0+kG8ilXr3DiVeKmdXG8bp89MZ1s2CR1uiHbR7AQkJ+DFiRV
+xW4IOAsSy06xTHAYHf0G3N+BkBJEJfo76cS3auaz5PiggRKcXdPo77MietCJjtLW
+Y9Tln5ZJrHydXRAePjD89vpukhG/LHCc2cl7ABEBAAHNM0Zvcmdlam86IEJleW9u
+ZCBjb2RpbmcuIFdlIGZvcmdlLiAoRGViaWFuIFJlZ2lzdHJ5KcLAYgQTAQgAFgUC
+ZL+zrwkQfJzSyuVhN4wCGwMCGQEAAEcLCAABj/QKDy/RbyUpkjbIxFXOfmIVf/vF
+RalgSONoT7e6MH48WwvJP7ggThMZwUjYYKSwFHJ86bcrxOX9fX81ZzZDzKzoplFy
+HvnNgqBuZt30P4C60Q+VzeiRagMMJSqzZR3ZBPa7KxMr0QJBM9aA6fUKxYiPxwfr
+D/R4alUb1J4Wyt3i/ioXurLP4L3cM5yb5PIXkQOd6NA9rH2WdkC971pen8c3tQF9
+da1W/XVOQ7OvBs556cm/1o0xurMcKiDnfUBiVWQLEZWTSsBclaFBEACaHEnj/vVs
+uhRKoxqmKTuq6yXvpNeOrUkpPb3rVCqNZ4UutT5nHdi1zc9gTJ3F7dSTzsBNBGS/
+s68BCADmfx9KS69mCFtX7wPD4NLYebjwz/fWfc+X1l7k/VsfMGNGQGM2qkQ44pKa
+EG0oG8mXtjUhFYEdQfXeSFZFg1ROIruBGNYAcAj3LUqXpQy3Ojjiq2L+OYH92uCF
+hiGI1TNA5LY9zITfmmNWVDsi8u/Ip4+OBn8MBZ+iYE373PEr0jkddH6ShORWehyO
+77/4ogpkei6b6kU3AEV+PTZgz1xrbiqDz5FSgY+niJMb+7MoYIC8doew1Ak5UdMv
+1b7vVmfre/frSCb8EO68eli0tosuaXV/7jwsLyXItxuqxjm8l3F3exOa8GiueruR
+l/12DYXs7vN2KYw6L0N/dexorYWRABEBAAHCwF8EGAEIABMFAmS/s68JEHyc0srl
+YTeMAhsMAABkNwgABNfuGkB/mqcMgLL/FLe+7PlBdngRUdCYD+ZbkgCk7npWP7sI
+t7bxQhYJtQwpbRW6pdhqM6M19sUT53SaZH1VbY4dOxV4ju5PGPdmJxxWNP6ZyvQF
+locHN8m9ROHdYixBTbhuNAUseUfz3EoQrvXpi6WUAqUfDgpRbV5AGqi0AfQaRkX3
+wyQowc3SYk8U1NtnEKLOFu7o+eR4Qh317BrBc9Ve0+GWTMbm9XaqCiVcz9iGtXQe
+cQsoKZHldRieBdNo0yg0hBu/PUl9rRNdG9LDFQ/uRksJ0rzJDG65U6LF1QfueuQo
+p2Ly49Vic8/G6sacJE02M1oEB1YvrqRKbe3Y5Q==
+=rsSQ
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/repo-deb/forgejo-deb.list b/repo-deb/forgejo-deb.list
index 7d9891d..946a727 100644
--- a/repo-deb/forgejo-deb.list
+++ b/repo-deb/forgejo-deb.list
@@ -1 +1 @@
-deb https://code.forgejo.org/api/packages/crystal/debian bullseye forgejo
+deb https://code.forgejo.org/api/packages/forgejo-contrib/debian bullseye forgejo
diff --git a/repo-deb/main/debian/changelog b/repo-deb/main/debian/changelog
index bb64aa6..d5a5e1c 100644
--- a/repo-deb/main/debian/changelog
+++ b/repo-deb/main/debian/changelog
@@ -1,3 +1,10 @@
+forgejo-deb-repo (2-0) unstable; urgency=medium
+
+  * Transitional package
+  * Move to https://code.forgejo.org/forgejo-contrib/-/packages
+
+ -- crystal <crystal@noreply.codeberg.org>  Tue, 25 Jul 2023 10:52:00 +0000
+
 forgejo-deb-repo (1-1) unstable; urgency=medium
 
   * Split key and repo package
diff --git a/repo-deb/main/debian/forgejo-deb-repokey.install b/repo-deb/main/debian/forgejo-deb-repokey.install
index 59d9c5c..5f22ee4 100644
--- a/repo-deb/main/debian/forgejo-deb-repokey.install
+++ b/repo-deb/main/debian/forgejo-deb-repokey.install
@@ -1 +1 @@
-code-forgejo-org-crystal.asc /etc/apt/trusted.gpg.d
+code-forgejo-org-forgejo-contrib.asc /etc/apt/trusted.gpg.d
diff --git a/repo-deb/stub/debian/changelog b/repo-deb/stub/debian/changelog
index 593d48f..84cc044 100644
--- a/repo-deb/stub/debian/changelog
+++ b/repo-deb/stub/debian/changelog
@@ -2,4 +2,4 @@ forgejo-deb-repo (0-0) unstable; urgency=medium
 
   * forgejo-deb APT repository stub
 
- -- crystal <crystal@noreply.codeberg.org>  Sun, 2 Jul 2023 20:30:00 +0000
+ -- crystal <crystal@noreply.codeberg.org>  Tue, 25 Jul 2023 10:50:00 +0000
diff --git a/repo-deb/stub/debian/forgejo-deb-repo.install b/repo-deb/stub/debian/forgejo-deb-repo.install
index f81b739..e5a7382 100644
--- a/repo-deb/stub/debian/forgejo-deb-repo.install
+++ b/repo-deb/stub/debian/forgejo-deb-repo.install
@@ -1,2 +1,2 @@
-code-forgejo-org-crystal.asc /etc/apt/trusted.gpg.d
+code-forgejo-org-forgejo-contrib.asc /etc/apt/trusted.gpg.d
 forgejo-deb.list /etc/apt/sources.list.d