First new update in prep for trixie

debian/changelog

@@ -1,40 +1,10 @@
-hibbian-archive-keyring (20240924~packetrepo11+3) bullseye-packetrepo-stable; urgency=medium
+hibbian-archive-keyring (20250715~hibbian~TRIXIE+1) UNRELEASED; urgency=medium
 
-  * Let's get that preference file here too! 
+  * New version targeting trixie only
+  * Streamlined install
+  * MINI_BUILDD_OPTION: lintian-mode=ignore
 
- -- Dave Hibberd <hibby@debian.org>  Tue, 05 Nov 2024 22:53:41 +0000
-
-hibbian-archive-keyring (20240924~packetrepo11+2) bullseye-packetrepo-stable; urgency=medium
-
-  * Correct folder this time 
-
- -- Dave Hibberd <hibby@debian.org>  Wed, 25 Sep 2024 00:46:29 +0100
-
-hibbian-archive-keyring (20240924~packetrepo11+1) bullseye-packetrepo-stable; urgency=medium
-
-  * Install straight to /etc/apt/sources.list.d 
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 24 Sep 2024 23:17:33 +0100
-
-hibbian-archive-keyring (20240826~packetrepo11+3) bullseye-packetrepo-stable; urgency=medium
-
-  * This time we can maybe get the name of the distro right! 
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 26 Aug 2024 22:35:05 +0100
-
-hibbian-archive-keyring (20240826~packetrepo11+2) bullseye-packetrepo-stable; urgency=medium
-
-  * Fix a typo of packeterpo 
-  * ah we'll just stick through some packaging updates too
-    - remember to drink some water.
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 26 Aug 2024 22:20:20 +0100
-
-hibbian-archive-keyring (20240826~packetrepo11+1) bullseye-packetrepo-stable; urgency=medium
-
-  * Build for bullseye packetrepo
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 26 Aug 2024 22:13:38 +0100
+ -- Dave Hibberd <hibby@debian.org>  Tue, 15 Jul 2025 23:58:45 +0100
 
 hibbian-archive-keyring (20240817205831~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 

debian/control

@@ -1,10 +1,10 @@
 Source: hibbian-archive-keyring
 Section: misc
 Priority: optional
-Maintainer: mini-buildd archive hibbian <repository@maxwell.hibbian.org>
-Uploaders: Dave Hibberd <hibby@debian.org>
-Build-Depends: debhelper-compat (=12)
-Standards-Version: 4.5.1
+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

debian/copyright

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

debian/install

@@ -1,5 +1,3 @@
 hibbian-archive-keyring.gpg usr/share/keyrings/
-hibbian-archive-keyring.gpg etc/apt/trusted.gpg.d/
-sources.list.d/bookworm/packetrepo_stable.list etc/apt/sources.list.d/
 sources.list.d/ usr/share/hibbian-archive-keyring/
-hibbian.pref etc/apt/preferences.d/
+sources.list.d/trixie/hibbian_stable.list etc/apt/sources.list.d/

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

debian/postinst

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

hibbian.pref

@@ -1,3 +0,0 @@
-Package: *
-Pin: release o=Hibbian
-Pin-Priority: 600

sources.list.d/bullseye/packetrepo_stable.list

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

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

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