diff -Nru linux-meta-aws-5.15.0.1053.52/debian/changelog linux-meta-aws-5.15.0.1057.58/debian/changelog --- linux-meta-aws-5.15.0.1053.52/debian/changelog 2024-01-19 18:56:56.000000000 +0000 +++ linux-meta-aws-5.15.0.1057.58/debian/changelog 2024-03-21 15:23:11.000000000 +0000 @@ -1,3 +1,48 @@ +linux-meta-aws (5.15.0.1057.58) jammy; urgency=medium + + * Miscellaneous Ubuntu changes + - debian/dkms-versions -- update from main + + -- Philip Cox Thu, 21 Mar 2024 11:23:11 -0400 + +linux-meta-aws (5.15.0.1057.57) jammy; urgency=medium + + + * Packaging resync (LP: #1786013) + - [Packaging] remove update-version script + + -- Philip Cox Tue, 19 Mar 2024 13:02:12 -0400 + +linux-meta-aws (5.15.0.1057.56) jammy; urgency=medium + + * Bump ABI 5.15.0-1057 + + * Packaging resync (LP: #1786013) + - [Packaging] resync debian/dkms-versions from main package + + -- Philip Cox Tue, 19 Mar 2024 07:04:12 -0400 + +linux-meta-aws (5.15.0.1056.55) jammy; urgency=medium + + * Bump ABI 5.15.0-1056 + + * Packaging resync (LP: #1786013) + - [Packaging] resync debian/dkms-versions from main package + + -- John Cabaj Wed, 13 Mar 2024 12:02:39 -0500 + +linux-meta-aws (5.15.0.1055.54) jammy; urgency=medium + + * Bump ABI 5.15.0-1055 + + -- Manuel Diewald Thu, 22 Feb 2024 13:27:21 +0100 + +linux-meta-aws (5.15.0.1054.53) jammy; urgency=medium + + * Bump ABI 5.15.0-1054 + + -- Yuxuan Luo Fri, 09 Feb 2024 14:17:23 -0500 + linux-meta-aws (5.15.0.1053.52) jammy; urgency=medium * Bump ABI 5.15.0-1053 diff -Nru linux-meta-aws-5.15.0.1053.52/debian/control linux-meta-aws-5.15.0.1057.58/debian/control --- linux-meta-aws-5.15.0.1053.52/debian/control 2024-01-19 18:56:56.000000000 +0000 +++ linux-meta-aws-5.15.0.1057.58/debian/control 2024-03-21 15:23:11.000000000 +0000 @@ -5,9 +5,9 @@ Standards-Version: 3.9.8 Build-Depends: dpkg (>= 1.13.19), debhelper (>= 9), gawk, kmod Build-Depends-Arch: - linux-aws-headers-5.15.0-1053, - linux-headers-5.15.0-1053-aws, - linux-modules-5.15.0-1053-aws, + linux-aws-headers-5.15.0-1057, + linux-headers-5.15.0-1057-aws, + linux-modules-5.15.0-1057-aws, Vcs-Git: git://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-meta-aws/+git/jammy Package: linux-headers-aws-lts-22.04 diff -Nru linux-meta-aws-5.15.0.1053.52/debian/dkms-versions linux-meta-aws-5.15.0.1057.58/debian/dkms-versions --- linux-meta-aws-5.15.0.1053.52/debian/dkms-versions 2024-01-19 13:31:15.000000000 +0000 +++ linux-meta-aws-5.15.0.1057.58/debian/dkms-versions 2024-03-21 15:12:23.000000000 +0000 @@ -1,2 +1,2 @@ -zfs-linux 2.1.5-1ubuntu6~22.04.2 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms +zfs-linux 2.1.5-1ubuntu6~22.04.3 modulename=zfs debpath=pool/universe/z/%package%/zfs-dkms_%version%_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms v4l2loopback 0.12.7-2ubuntu2~22.04.1 modulename=v4l2loopback debpath=pool/universe/v/%package%/v4l2loopback-dkms_%version%_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms diff -Nru linux-meta-aws-5.15.0.1053.52/update-version linux-meta-aws-5.15.0.1057.58/update-version --- linux-meta-aws-5.15.0.1053.52/update-version 2024-01-17 21:30:52.000000000 +0000 +++ linux-meta-aws-5.15.0.1057.58/update-version 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -#!/bin/bash - -tag_prefix=`dpkg-parsechangelog -S Source | sed 's/linux-meta/Ubuntu/'`- - -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " 1>&2 - exit 1 -fi -master_dir="$1" - -# Work out the master kernel version. -if [ -f "$master_dir/debian/debian.env" ]; then - branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` - changelog="-l$branch/changelog" -else - changelog="" -fi -master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -S Version $changelog)` - -# Work out our current version taking into account closed sections. -here_series=$( LC_ALL=C dpkg-parsechangelog -S Distribution ) -if [ "$here_series" = "UNRELEASED" ]; then - here_version=$( LC_ALL=C dpkg-parsechangelog -o 1 -S Version ) - here_series=$( LC_ALL=C dpkg-parsechangelog -c 1 -S Distribution ) -else - here_version=$( LC_ALL=C dpkg-parsechangelog -S Version ) -fi - -# Ensure we have the appropriate tag. -here_tagversion=$( echo "$tag_prefix$here_version" | sed -e 's/~/_/g' ) -count=$( git for-each-ref "refs/tags/$here_tagversion" | wc -l ) -if [ "$count" != 1 ]; then - echo "$0: $here_tagversion: tag not found" 1>&2 - exit 1 -fi - -# Update things from the primary package. -for thing in \ - debian/dkms-versions \ - debian/scripts/misc/git-ubuntu-log -do - from="$master_dir/$thing" - to="$thing" - - if [ -f "$from" ]; then - cp -p "$from" "$to" || exit 1 - git add "$to" || exit 1 - else - rm -f "$to" - git rm --ignore-unmatch "$to" || exit 1 - fi - if ! git diff --exit-code HEAD -- "$thing" >/dev/null; then - msg="UBUNTU: [Packaging] resync $thing from main package - -BugLink: http://bugs.launchpad.net/bugs/1786013" - git commit -m "$msg" -s -- "$thing" - else - echo "$thing: no changes from master" - fi -done - -# We need to ensure the ABI number matches our master source. -# extract both for comparison. -here_abi=${here_version%.*} -master_abi=$(echo ${master_version%.*} | sed -e 's/-/./g') -master_abi_human=${master_version%.*} - -if grep -q '[~+][0-9][0-9]\.[0-9][0-9]\.[0-9]\+$' <<<"$master_version" && \ - dpkg --compare-versions "$here_abi" lt "$master_abi"; then - # Version looks like a backport kernel, and this is a new abi. - # Reset the upload number. - here_upload="1" -else - # Extract the upload number from the _previous_ upload and increment it. - here_upload=${here_version##*.} - here_upload=$(( $here_upload + 1 )) -fi -here_newversion="$master_abi.$here_upload" - -#echo "here_version<$here_version> here_abi<$here_abi> here_newversion<$here_newversion>" -#echo "master_version<$master_version> master_abi<$master_abi>" - -# First insert any primary changes. -marker="__CHANGELOG_FRAGMENT_MARKER__" -dch --newversion "$here_newversion" "$marker" - -# Prepare the the blank changelog. -tmp="/tmp/$$.msg" - -# If the parent represents an ABI bump include that. -if dpkg --compare-versions "$here_abi" lt "$master_abi"; then - echo "Updated to ABI: $master_abi" - [ -f "$tmp" ] && echo "" >>"$tmp" - echo " * Bump ABI $master_abi_human" >>"$tmp" -fi - -# Format any existing commits. -count=$( git log --oneline "$here_tagversion".. | wc -l ) -if [ "$count" != 0 ]; then - [ -f "$tmp" ] && echo "" >>"$tmp" - git log "$here_tagversion".. | "debian/scripts/misc/git-ubuntu-log" >>"$tmp" -fi - -# Insert official changelog fragment. -sed -i -e '/^ \* '"$marker"'/{ -r '"$tmp"' -d -}' debian/changelog -rm -f "$tmp" - -# Close this changelog entry. -dch --distribution "$here_series" --release '' - -# Emit final closing commands. -echo "git commit -s -m 'UBUNTU: $tag_prefix$here_newversion' debian/changelog" -here_tagversion=$( echo "$tag_prefix$here_newversion" | sed -e 's/~/_/g' ) -echo "git tag -s -m '$tag_prefix$here_newversion' '$here_tagversion'"