First new update in prep for trixie

This commit is contained in:
Hibby 2025-07-16 01:06:27 +01:00
parent b3a2df6db9
commit f730a4fff9
Signed by: hibby
SSH Key Fingerprint: SHA256:ViFfX52KgQaoCxTxHiwIrQMVu7w0GrUUnxAi3Em8JJs
14 changed files with 28 additions and 35 deletions

8
debian/changelog vendored
View File

@ -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 <hibby@debian.org> 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'.

1
debian/compat vendored
View File

@ -1 +0,0 @@
9

7
debian/control vendored
View File

@ -1,9 +1,10 @@
Source: hibbian-archive-keyring
Section: misc
Priority: optional
Maintainer: mini-buildd archive hibbian <repository@maxwell.hibbian.org>
Build-Depends: debhelper (>= 9)
Standards-Version: 4.0.0
Maintainer: Dave Hibberd <hibby@debian.org>
Build-Depends: debhelper-compat (= 13)
Rules-Requires-Root: no
Standards-Version: 4.7.2
Package: hibbian-archive-keyring
Architecture: all

13
debian/copyright vendored
View File

@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: Stephan Sürken <absurd@debian.org>
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 <hibby@debian.org>
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 <absurd@debian.org>
Copyright: © 2012-2025 Stephan Sürken <absurd@debian.org>
2024-2025 Dave Hibberd <hibby@debian.org>
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.

3
debian/install vendored
View File

@ -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/

4
debian/lintian-overrides vendored Normal file
View File

@ -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

18
debian/postinst vendored
View File

@ -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#

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (native)

View File

@ -1 +0,0 @@
deb [] http://repo.hibbian.org/hibbian bookworm-hibbian-stable main contrib non-free non-free-firmware

View File

@ -1 +0,0 @@
deb-src [] http://repo.hibbian.org/hibbian bookworm-hibbian-stable main contrib non-free non-free-firmware

View File

@ -1 +0,0 @@
deb [] http://repo.hibbian.org/hibbian bookworm-hibbian-unstable main contrib non-free non-free-firmware

View File

@ -1 +0,0 @@
deb-src [] http://repo.hibbian.org/hibbian bookworm-hibbian-unstable main contrib non-free non-free-firmware

View File

@ -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

View File

@ -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