diff -Nru linux-signed-4.15.0/debian/changelog linux-signed-4.15.0/debian/changelog --- linux-signed-4.15.0/debian/changelog 2018-04-20 12:29:23.000000000 +0000 +++ linux-signed-4.15.0/debian/changelog 2018-04-21 22:32:56.000000000 +0000 @@ -1,3 +1,23 @@ +linux-signed (4.15.0-19.20) bionic; urgency=medium + + * Master version: 4.15.0-19.20 + + -- Seth Forshee Sat, 21 Apr 2018 17:32:56 -0500 + +linux-signed (4.15.0-18.19+signed2) bionic; urgency=medium + + * Fix dbgsym package handling to work for the case where we have a + bumped linux-signed version number. + + -- Steve Langasek Sat, 21 Apr 2018 00:38:57 -0700 + +linux-signed (4.15.0-18.19+signed1) bionic; urgency=medium + + * Fix the dbgsym packages to be correctly named as .ddeb instead of .deb + so they are published to the right archive. + + -- Steve Langasek Sat, 21 Apr 2018 04:57:38 +0000 + linux-signed (4.15.0-18.19) bionic; urgency=medium * Master version: 4.15.0-18.19 diff -Nru linux-signed-4.15.0/debian/control linux-signed-4.15.0/debian/control --- linux-signed-4.15.0/debian/control 2018-04-20 12:29:23.000000000 +0000 +++ linux-signed-4.15.0/debian/control 2018-04-21 22:32:56.000000000 +0000 @@ -8,55 +8,55 @@ python3, python3-apt, sbsigntool [amd64], - linux-libc-dev (>= 4.15.0-18.19), + linux-libc-dev (>= 4.15.0-19.20), Standards-Version: 3.9.4 -Package: linux-image-4.15.0-18-generic +Package: linux-image-4.15.0-19-generic Architecture: amd64 ppc64el Depends: ${unsigned:Depends} Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux (= 4.15.0-18.19) +Built-Using: linux (= 4.15.0-19.20) Description: Signed kernel image generic A kernel image for generic. This version of it is signed with Canonical's UEFI/Opal signing key. -Package: linux-image-4.15.0-18-lowlatency +Package: linux-image-4.15.0-19-lowlatency Architecture: amd64 Depends: ${unsigned:Depends} Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux (= 4.15.0-18.19) +Built-Using: linux (= 4.15.0-19.20) Description: Signed kernel image lowlatency A kernel image for lowlatency. This version of it is signed with Canonical's UEFI signing key. -Package: kernel-signed-image-4.15.0-18-generic-di +Package: kernel-signed-image-4.15.0-19-generic-di Package-Type: udeb Section: debian-installer Priority: extra Provides: kernel-signed-image Architecture: amd64 ppc64el -Built-Using: linux (= 4.15.0-18.19) +Built-Using: linux (= 4.15.0-19.20) Description: Signed kernel image generic for the Debian installer A kernel image for generic. This version of it is signed with Canonical's UEFI signing key. It is intended for the Debian installer, it does _not_ provide a usable kernel for your full Debian system. -Package: linux-image-4.15.0-18-generic-dbgsym +Package: linux-image-4.15.0-19-generic-dbgsym Section: devel Architecture: amd64 ppc64el -Depends: linux-image-unsigned-4.15.0-18-generic-dbgsym +Depends: linux-image-unsigned-4.15.0-19-generic-dbgsym Description: Signed kernel image generic A link to the debugging symbols for the generic signed kernel. -Package: linux-image-4.15.0-18-lowlatency-dbgsym +Package: linux-image-4.15.0-19-lowlatency-dbgsym Section: devel Architecture: amd64 -Depends: linux-image-unsigned-4.15.0-18-lowlatency-dbgsym +Depends: linux-image-unsigned-4.15.0-19-lowlatency-dbgsym Description: Signed kernel image lowlatency A link to the debugging symbols for the lowlatency signed kernel. diff -Nru linux-signed-4.15.0/debian/rules linux-signed-4.15.0/debian/rules --- linux-signed-4.15.0/debian/rules 2018-04-20 12:28:04.000000000 +0000 +++ linux-signed-4.15.0/debian/rules 2018-04-21 22:32:31.000000000 +0000 @@ -9,7 +9,8 @@ # is the name of this package with -signed stripped. The version is identical # to this package less any rebuild suffic (+signedN). src_package := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f 2 | sed -e 's/-signed//') -src_version = $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2 | sed -e 's/+signed[0-9]*.*//') +src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) +src_version = $(shell echo $(src_fullversion) | sed -e 's/+signed[0-9]*.*//') src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') # We build our control file. This has to be done before dh runs otherwise @@ -82,3 +83,12 @@ >"debian/$$package.triggers"; \ done dh_install + +override_dh_builddeb: + dh_builddeb + for pkg in $$(dh_listpackages); do \ + case $$pkg in *dbgsym) ;; *) continue ;; esac; \ + mv ../$${pkg}_$(src_fullversion)_$(DEB_HOST_ARCH).deb \ + ../$${pkg}_$(src_fullversion)_$(DEB_HOST_ARCH).ddeb; \ + sed -i "/^$${pkg}_/s/\.deb /.ddeb /" debian/files; \ + done