From f730a4fff928856b3170d0528c5b8d519b62978c Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Wed, 16 Jul 2025 01:06:27 +0100 Subject: [PATCH] First new update in prep for trixie --- debian/changelog | 8 ++++++++ debian/compat | 1 - debian/control | 7 ++++--- debian/copyright | 13 ++++++------- debian/install | 3 +-- debian/lintian-overrides | 4 ++++ debian/postinst | 18 ------------------ debian/source/format | 1 + sources.list.d/bookworm/hibbian_stable.list | 1 - .../bookworm/hibbian_stable_src.list | 1 - sources.list.d/bookworm/hibbian_unstable.list | 1 - .../bookworm/hibbian_unstable_src.list | 1 - sources.list.d/trixie/hibbian_stable.list | 2 ++ sources.list.d/trixie/hibbian_unstable.list | 2 ++ 14 files changed, 28 insertions(+), 35 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/lintian-overrides delete mode 100644 debian/postinst create mode 100644 debian/source/format delete mode 100644 sources.list.d/bookworm/hibbian_stable.list delete mode 100644 sources.list.d/bookworm/hibbian_stable_src.list delete mode 100644 sources.list.d/bookworm/hibbian_unstable.list delete mode 100644 sources.list.d/bookworm/hibbian_unstable_src.list create mode 100644 sources.list.d/trixie/hibbian_stable.list create mode 100644 sources.list.d/trixie/hibbian_unstable.list diff --git a/debian/changelog b/debian/changelog index 5ca0c24..f8c303f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +hibbian-archive-keyring (20250715~hibbian~TRIXIE+1) UNRELEASED; urgency=medium + + * New version targeting trixie only + * Streamlined install + * MINI_BUILDD_OPTION: lintian-mode=ignore + + -- Dave Hibberd Tue, 15 Jul 2025 23:58:45 +0100 + hibbian-archive-keyring (20240817205831~hibbian+1) bookworm-hibbian-unstable; urgency=medium * Automatic keyring package for archive 'hibbian'. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index c814c34..9a6ce3f 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,10 @@ Source: hibbian-archive-keyring Section: misc Priority: optional -Maintainer: mini-buildd archive hibbian -Build-Depends: debhelper (>= 9) -Standards-Version: 4.0.0 +Maintainer: Dave Hibberd +Build-Depends: debhelper-compat (= 13) +Rules-Requires-Root: no +Standards-Version: 4.7.2 Package: hibbian-archive-keyring Architecture: all diff --git a/debian/copyright b/debian/copyright index a998827..8ac0d4e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Contact: Stephan Sürken -Source: http://ftp.debian.org/debian/pool/main/m/mini-buildd/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Dave Hibberd +Source: https://git.hibbian.org/Hibbian/hibbian-keyring Comment: Inspired by the debian-edu keyring package. This sources from a general template to generate keyring packages under @@ -10,7 +10,8 @@ Comment: when mini-buildd is installed. Files: * -Copyright: © 2012- Stephan Sürken +Copyright: © 2012-2025 Stephan Sürken + 2024-2025 Dave Hibberd License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,9 +24,7 @@ License: GPL-2+ General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. + along with this program. If not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU General Public License can be found in '/usr/share/common-licenses/GPL-2' file. diff --git a/debian/install b/debian/install index a0b9f5e..7c6d415 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,3 @@ hibbian-archive-keyring.gpg usr/share/keyrings/ -hibbian-archive-keyring.gpg etc/apt/trusted.gpg.d/ sources.list.d/ usr/share/hibbian-archive-keyring/ -certs/ usr/share/hibbian-archive-keyring/ +sources.list.d/trixie/hibbian_stable.list etc/apt/sources.list.d/ diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..050a8ed --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,4 @@ +# That is, in fact, the point +hibbian-archive-keyring: package-installs-apt-sources +# I know, I don't care +hibbian-archive-keyring: openpgp-file-has-implementation-specific-extension diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 8cfd68a..0000000 --- a/debian/postinst +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -# Remove keys from trusted.gpg -- now in trusted.gpg.d/ -# (Adapted code from postinst from debian-archive-keyring) -if [ "$1" = 'configure' -a -n "$2" ]; then - if which gpg > /dev/null && which apt-key > /dev/null; then - TRUSTEDFILE='/etc/apt/trusted.gpg' - eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) - eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f) - if [ -e "$TRUSTEDFILE" ]; then - apt-key --keyring "$TRUSTEDFILE" del 5B546E55D30D2816 > /dev/null 2>&1 || : - fi - fi -fi - -#DEBHELPER# diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/sources.list.d/bookworm/hibbian_stable.list b/sources.list.d/bookworm/hibbian_stable.list deleted file mode 100644 index 34b5af5..0000000 --- a/sources.list.d/bookworm/hibbian_stable.list +++ /dev/null @@ -1 +0,0 @@ -deb [] http://repo.hibbian.org/hibbian bookworm-hibbian-stable main contrib non-free non-free-firmware diff --git a/sources.list.d/bookworm/hibbian_stable_src.list b/sources.list.d/bookworm/hibbian_stable_src.list deleted file mode 100644 index 7f38e6e..0000000 --- a/sources.list.d/bookworm/hibbian_stable_src.list +++ /dev/null @@ -1 +0,0 @@ -deb-src [] http://repo.hibbian.org/hibbian bookworm-hibbian-stable main contrib non-free non-free-firmware diff --git a/sources.list.d/bookworm/hibbian_unstable.list b/sources.list.d/bookworm/hibbian_unstable.list deleted file mode 100644 index 31de4fa..0000000 --- a/sources.list.d/bookworm/hibbian_unstable.list +++ /dev/null @@ -1 +0,0 @@ -deb [] http://repo.hibbian.org/hibbian bookworm-hibbian-unstable main contrib non-free non-free-firmware diff --git a/sources.list.d/bookworm/hibbian_unstable_src.list b/sources.list.d/bookworm/hibbian_unstable_src.list deleted file mode 100644 index 7960409..0000000 --- a/sources.list.d/bookworm/hibbian_unstable_src.list +++ /dev/null @@ -1 +0,0 @@ -deb-src [] http://repo.hibbian.org/hibbian bookworm-hibbian-unstable main contrib non-free non-free-firmware diff --git a/sources.list.d/trixie/hibbian_stable.list b/sources.list.d/trixie/hibbian_stable.list new file mode 100644 index 0000000..8a9d8c2 --- /dev/null +++ b/sources.list.d/trixie/hibbian_stable.list @@ -0,0 +1,2 @@ +deb [signed-by=/usr/share/keyrings/hibbian-archive-keyring.gpg] http://repo.hibbian.org/hibbian trixie-hibbian-stable main +deb-src [signed-by=/usr/share/keyrings/hibbian-archive-keyring.gpg] http://repo.hibbian.org/hibbian trixie-hibbian-stable main diff --git a/sources.list.d/trixie/hibbian_unstable.list b/sources.list.d/trixie/hibbian_unstable.list new file mode 100644 index 0000000..aa4a3cd --- /dev/null +++ b/sources.list.d/trixie/hibbian_unstable.list @@ -0,0 +1,2 @@ +deb [signed-by=/usr/share/keyrings/hibbian-archive-keyring.gpg] http://repo.hibbian.org/hibbian trixie-hibbian-unstable main +deb-src [signed-by=/usr/share/keyrings/hibbian-archive-keyring.gpg] http://repo.hibbian.org/hibbian trixie-hibbian-unstable main