diff -Nru kernel-wedge-2.104ubuntu1/commands/check kernel-wedge-2.105/commands/check --- kernel-wedge-2.104ubuntu1/commands/check 2021-11-08 10:23:07.000000000 +0000 +++ kernel-wedge-2.105/commands/check 2021-01-09 15:38:18.000000000 +0000 @@ -3,14 +3,7 @@ if [ $# -ge 1 ]; then packages="$*" else - packages_all="$(dh_listpackages -s)" - packages="" - for pkg in $packages_all - do - case "$pkg" in - *-di) packages="$packages $pkg" ;; - esac - done + packages="$(dh_listpackages -s)" fi for pkg in $packages; do if [ -z "$(find debian/$pkg -type f)" ]; then diff -Nru kernel-wedge-2.104ubuntu1/commands/preprocess kernel-wedge-2.105/commands/preprocess --- kernel-wedge-2.104ubuntu1/commands/preprocess 2020-03-30 13:46:51.000000000 +0000 +++ kernel-wedge-2.105/commands/preprocess 2023-10-19 18:11:12.000000000 +0000 @@ -28,7 +28,7 @@ File::Find::find({ follow => 1, # If $moddir is a symlink, follow it. wanted => sub { - if (/\.ko$/) { + if (/\.ko(?:\.(?:xz|zstd))?$/) { push @module_files, File::Spec->abs2rel($File::Find::name, $moddir); @@ -105,15 +105,15 @@ } # Add module suffix; anchor at start and end of string - @regexps = ('^' . $re . '\.ko$'); + @regexps = ('^' . $re . '\.ko(?:\.(?:xz|zstd))?$'); } else { # If pattern doesn't include a wildcard, find the # module in any subdir, but prefer a module in the # kernel subdir. We still do wildcard processing # to handle equivalence of '-' and '_' for Linux. my $re = wildcard_to_regexp($pattern); - @regexps = ('^kernel/(?:.*/)?' . $re . '\.ko$', - '(?:^|/)' . $re . '\.ko$'); + @regexps = ('^kernel/(?:.*/)?' . $re . '\.ko(?:\.(?:xz|zstd))?$', + '(?:^|/)' . $re . '\.ko(?:\.(?:xz|zstd))?$'); } my @modules; diff -Nru kernel-wedge-2.104ubuntu1/debian/changelog kernel-wedge-2.105/debian/changelog --- kernel-wedge-2.104ubuntu1/debian/changelog 2021-11-08 10:23:13.000000000 +0000 +++ kernel-wedge-2.105/debian/changelog 2023-10-19 18:11:44.000000000 +0000 @@ -1,16 +1,19 @@ -kernel-wedge (2.104ubuntu1) jammy; urgency=medium +kernel-wedge (2.105) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - check: Only check -di packages. + [ Debian Janitor ] + * Remove constraints unnecessary since buster: + + kernel-wedge: Drop versioned constraint on debhelper in Depends. + * Bump debhelper from old 12 to 13. + * Fix day-of-week for changelog entry 0.9. + * Update standards version to 4.6.1, no changes needed. - * Drop changes: - - commands/copy-firmware - linux per-version kernel ./firmware has - been removed in v4.13-1-g5620a0d1aa and thus it is no longer required - to copy firmware from kernel modules deb into udeb. Instead - nic-firmware / scsi-firmware udebs from src:linux-firmware are in use - in bionic+. + [ Samuel Thibault ] + * Make gbp produce the right tag format. + + [ Bastian Blank ] + * Support compressed modules. - -- Dimitri John Ledkov Mon, 08 Nov 2021 10:23:13 +0000 + -- Bastian Blank Thu, 19 Oct 2023 20:11:44 +0200 kernel-wedge (2.104) unstable; urgency=medium @@ -117,36 +120,6 @@ -- Ben Hutchings Thu, 30 Aug 2018 18:14:28 +0100 -kernel-wedge (2.96ubuntu3) artful; urgency=low - - * commands/copy-firmware -- ensure we drop the firmware into the - versioned directory. (LP: #1696925) - - -- Andy Whitcroft Wed, 28 Jun 2017 13:21:49 +0100 - -kernel-wedge (2.96ubuntu2) artful; urgency=low - - * check: suppress error exit from grep when there are no -di packages - while maintaining any exit code from dh_listpackages. (LP: #1690118) - * drop errant debian/files. - * commands/copy-firmware -- fix up fwdir handling so we find and include - firmware and dtb files. (LP: #1696925) - - -- Andy Whitcroft Thu, 11 May 2017 11:28:56 +0100 - -kernel-wedge (2.96ubuntu1) artful; urgency=low - - * Merge from Debian unstable. Remaining changes: - - copy-firmware: Firmware udeb handling (and related changes). - - check: Only check -di packages. - * Dropped changes: - - gen-control: Emit debian/control.stub if it exists -- we have adapted - the kernel package to cope with either kernel-wedge. - - install-files: allow kernel-versions bdep field to be empty -- we have - had this field filled for a very long time. - - -- Andy Whitcroft Fri, 28 Apr 2017 04:17:37 +0100 - kernel-wedge (2.96) unstable; urgency=medium [ Cyril Brulebois ] @@ -199,17 +172,6 @@ -- Christian Perrier Fri, 12 Feb 2016 19:06:26 +0100 -kernel-wedge (2.90ubuntu1) wily; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Andy Whitcroft Fri, 31 Jul 2015 16:17:27 +0100 - kernel-wedge (2.90) unstable; urgency=medium [ Aurelien Jarno ] @@ -219,17 +181,6 @@ -- Aurelien Jarno Fri, 12 Sep 2014 23:23:31 +0200 -kernel-wedge (2.89ubuntu1) utopic; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Andy Whitcroft Wed, 14 May 2014 14:07:13 +0100 - kernel-wedge (2.89) unstable; urgency=medium [ Ben Hutchings ] @@ -245,17 +196,6 @@ -- Christian Perrier Wed, 11 Sep 2013 07:12:05 +0200 -kernel-wedge (2.87ubuntu1) saucy; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Oussama Bounaim Wed, 24 Jul 2013 15:56:51 +0100 - kernel-wedge (2.87) unstable; urgency=low [ Dmitrijs Ledkovs ] @@ -268,17 +208,6 @@ -- Christian Perrier Sun, 14 Jul 2013 12:50:35 +0200 -kernel-wedge (2.86ubuntu1) saucy; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Andy Whitcroft Tue, 21 May 2013 17:57:11 +0100 - kernel-wedge (2.86) unstable; urgency=low * Team upload @@ -292,17 +221,6 @@ -- Christian Perrier Sun, 12 May 2013 19:10:58 +0200 -kernel-wedge (2.85ubuntu1) raring; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Andy Whitcroft Wed, 21 Nov 2012 15:56:27 +0000 - kernel-wedge (2.85) unstable; urgency=low * gen-deps: Ignore dependencies in default package-list that are @@ -325,18 +243,6 @@ -- Ben Hutchings Sun, 03 Jun 2012 01:42:31 +0100 -kernel-wedge (2.83ubuntu1) quantal; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - * Copy KW_CHECK_NONFATAL handling into copy-firmware. - - -- Colin Watson Tue, 22 May 2012 15:08:20 +0100 - kernel-wedge (2.83) unstable; urgency=low [ Aurelien Jarno ] @@ -350,17 +256,6 @@ -- Ben Hutchings Sat, 03 Dec 2011 02:24:30 +0000 -kernel-wedge (2.82ubuntu1) precise; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - gen-control: Emit debian/control.stub if it exists regardless of - whether there are any architecture-specific build-dependencies; a - missing debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Colin Watson Mon, 14 Nov 2011 12:40:48 +0000 - kernel-wedge (2.82) unstable; urgency=low [ Robert Millan ] @@ -369,22 +264,6 @@ -- Aurelien Jarno Mon, 31 Oct 2011 18:31:41 +0100 -kernel-wedge (2.81ubuntu2) precise; urgency=low - - * gen-control: Emit debian/control.stub if it exists regardless of whether - there are any architecture-specific build-dependencies; a missing - debian/control.stub is an error if and only if there are - architecture-specific build-dependencies. - - -- Colin Watson Wed, 26 Oct 2011 12:53:39 +0100 - -kernel-wedge (2.81ubuntu1) precise; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Tue, 25 Oct 2011 17:11:14 +0100 - kernel-wedge (2.81) unstable; urgency=low [ Joey Hess ] @@ -465,13 +344,6 @@ -- Otavio Salvador Sun, 15 May 2011 17:40:45 -0300 -kernel-wedge (2.75ubuntu1) oneiric; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Tue, 03 May 2011 23:45:36 +0100 - kernel-wedge (2.75) unstable; urgency=low * Updating the version due a mistaken upload to unstable of a release @@ -505,13 +377,6 @@ -- Otavio Salvador Sat, 19 Feb 2011 21:01:14 -0200 -kernel-wedge (2.73ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Fri, 24 Dec 2010 17:43:42 +0000 - kernel-wedge (2.73) unstable; urgency=low [ Otavio Salvador ] @@ -530,26 +395,12 @@ -- Otavio Salvador Wed, 08 Dec 2010 17:46:52 -0200 -kernel-wedge (2.71ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Mon, 15 Nov 2010 11:16:26 +0000 - kernel-wedge (2.71) unstable; urgency=low * input-modules: add hid-sunplus. Closes: #603318. -- Otavio Salvador Sat, 13 Nov 2010 09:42:51 -0200 -kernel-wedge (2.70ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Wed, 03 Nov 2010 16:16:33 +0000 - kernel-wedge (2.70) unstable; urgency=low * input-modules: include hid-monterey. Thanks to Miguel Figueiredo @@ -563,13 +414,6 @@ -- Otavio Salvador Wed, 13 Oct 2010 23:18:12 -0300 -kernel-wedge (2.68ubuntu1) natty; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Fri, 15 Oct 2010 13:55:51 +0100 - kernel-wedge (2.68) unstable; urgency=low * linux: add phy drivers into nic-extra-modules. Closes: #595914, #599213. @@ -630,19 +474,6 @@ -- Otavio Salvador Mon, 19 Jul 2010 09:49:40 -0300 -kernel-wedge (2.63ubuntu2) maverick; urgency=low - - * Make copy-firmware executable again. - - -- Colin Watson Sat, 17 Jul 2010 23:35:32 +0100 - -kernel-wedge (2.63ubuntu1) maverick; urgency=low - - * Resynchronise with Debian. Remaining changes: - - Firmware udeb handling (copy-firmware and related changes). - - -- Colin Watson Thu, 15 Jul 2010 17:07:05 +0100 - kernel-wedge (2.63) unstable; urgency=low [ Frans Pop ] @@ -1096,30 +927,6 @@ -- Joey Hess Fri, 26 Jan 2007 14:43:56 -0500 -kernel-wedge (2.29ubuntu3) karmic; urgency=low - - * In case of error, try to list more failures before bailing out. - Requested by Tim Gardner (LP: #410221). - - -- Colin Watson Mon, 10 Aug 2009 09:37:20 +0100 - -kernel-wedge (2.29ubuntu2) feisty; urgency=low - - * There is no longer a firmware directory to install. Fixes FTBFS. - - -- Ben Collins Thu, 21 Dec 2006 19:01:11 -0500 - -kernel-wedge (2.29ubuntu1) feisty; urgency=low - - * Merge from debian unstable. - - Removed unionfs addition (unused) - - Removed make-links (unused) - - * Still remaining - - Firmware udeb handling (copy-firmware and related changes). - - -- Ben Collins Wed, 15 Nov 2006 01:33:14 +0000 - kernel-wedge (2.29) unstable; urgency=low * Add cdc_ether to nic-usb-modules. @@ -2203,7 +2010,7 @@ - build-all updated, enhanced to generate cross-compiler stubs automatically. - -- Joey Hess Fri, 26 Oct 2003 13:53:06 +0100 + -- Joey Hess Sun, 26 Oct 2003 13:53:06 +0100 linux-kernel-di (0.8) unstable; urgency=low diff -Nru kernel-wedge-2.104ubuntu1/debian/control kernel-wedge-2.105/debian/control --- kernel-wedge-2.104ubuntu1/debian/control 2021-11-08 10:23:13.000000000 +0000 +++ kernel-wedge-2.105/debian/control 2023-09-23 18:31:15.000000000 +0000 @@ -1,18 +1,17 @@ Source: kernel-wedge Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Install System Team +Maintainer: Debian Install System Team Uploaders: Steve Langasek , Ben Hutchings -Build-Depends: debhelper-compat (= 12) +Build-Depends: debhelper-compat (= 13) Rules-Requires-Root: no -Standards-Version: 4.4.1 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/installer-team/kernel-wedge Vcs-Git: https://salsa.debian.org/installer-team/kernel-wedge.git Package: kernel-wedge Architecture: all -Depends: ${misc:Depends}, debhelper (>= 9), make +Depends: ${misc:Depends}, debhelper, make Multi-Arch: foreign Description: udeb package builder for Debian-Installer kernel-wedge splits udeb packages out of a kernel image deb. The udebs diff -Nru kernel-wedge-2.104ubuntu1/debian/gbp.conf kernel-wedge-2.105/debian/gbp.conf --- kernel-wedge-2.104ubuntu1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ kernel-wedge-2.105/debian/gbp.conf 2023-09-23 18:31:15.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +debian-tag=%(version)s