diff -Nru init-system-helpers-1.68/debian/changelog init-system-helpers-1.69~deb13u1/debian/changelog --- init-system-helpers-1.68/debian/changelog 2024-12-29 13:52:41.000000000 +0000 +++ init-system-helpers-1.69~deb13u1/debian/changelog 2025-08-20 14:39:01.000000000 +0100 @@ -1,3 +1,16 @@ +init-system-helpers (1.69~deb13u1) trixie; urgency=medium + + * Upload to trixie + + -- Luca Boccassi Wed, 20 Aug 2025 14:39:01 +0100 + +init-system-helpers (1.69) unstable; urgency=medium + + * Add postinst to hotfix an upgrade bug on certain newly live-installed + systems built using Trixie's live-build (Closes: #1111039) + + -- Luca Boccassi Fri, 15 Aug 2025 19:46:44 +0100 + init-system-helpers (1.68) unstable; urgency=medium * Drop no longer needed dependency on usrmerge | usr-is-merged. diff -Nru init-system-helpers-1.68/debian/gbp.conf init-system-helpers-1.69~deb13u1/debian/gbp.conf --- init-system-helpers-1.68/debian/gbp.conf 2024-12-29 13:52:41.000000000 +0000 +++ init-system-helpers-1.69~deb13u1/debian/gbp.conf 2025-08-20 14:39:01.000000000 +0100 @@ -1,3 +1,6 @@ +[DEFAULT] +debian-branch = trixie + [dch] full = True multimaint-merge = True diff -Nru init-system-helpers-1.68/debian/init-system-helpers.lintian-overrides init-system-helpers-1.69~deb13u1/debian/init-system-helpers.lintian-overrides --- init-system-helpers-1.68/debian/init-system-helpers.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ init-system-helpers-1.69~deb13u1/debian/init-system-helpers.lintian-overrides 2025-08-15 20:53:32.000000000 +0100 @@ -0,0 +1,2 @@ +# duh +init-system-helpers: package-uses-local-diversion diff -Nru init-system-helpers-1.68/debian/init-system-helpers.postinst init-system-helpers-1.69~deb13u1/debian/init-system-helpers.postinst --- init-system-helpers-1.68/debian/init-system-helpers.postinst 1970-01-01 01:00:00.000000000 +0100 +++ init-system-helpers-1.69~deb13u1/debian/init-system-helpers.postinst 2025-08-15 19:38:12.000000000 +0100 @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +# begin-remove-after: released:forky +# Workaround for live-build issue #1111039 which affects some rootfs +# installed by the installer flavor that copies the livefs onto the rootfs +# instead of bootstrapping from packages +if [ "$1" = "configure" ] && [ -n "$2" ] && dpkg-divert --list /etc/os-release | grep -q os-release.debootstrap; then + dpkg-divert --quiet --local --remove --no-rename /etc/os-release + rm -f /etc/os-release + ln -s ../usr/lib/os-release /etc/os-release +fi +# end-remove-after + +#DEBHELPER# diff -Nru init-system-helpers-1.68/debian/salsa-ci.yml init-system-helpers-1.69~deb13u1/debian/salsa-ci.yml --- init-system-helpers-1.68/debian/salsa-ci.yml 2024-12-29 13:52:41.000000000 +0000 +++ init-system-helpers-1.69~deb13u1/debian/salsa-ci.yml 2025-08-20 14:39:01.000000000 +0100 @@ -4,6 +4,15 @@ variables: SALSA_CI_PIUPARTS_ARGS: --scriptsdir $CI_PROJECT_DIR/piuparts_scriptdir + RELEASE: 'trixie' + SALSA_CI_IMAGES_LINTIAN: ${SALSA_CI_IMAGES}/lintian:stable + SALSA_CI_LINTIAN_SUPPRESS_TAGS: "bad-distribution-in-changes-file" + # The following jobs all run on unstable, and cannot work because they expect + # overrides, compiler flags, dependencies, etc to work as in unstable, but this + # is a stable branch + SALSA_CI_DISABLE_BLHC: 1 + SALSA_CI_DISABLE_REPROTEST: 1 + SALSA_CI_DISABLE_PIUPARTS: 1 # salsaci calls piuparts with a package as a filename in contrast to # piuparts.d.o which calls piuparts with package=version. This means that the