UBUNTU: Ubuntu-unstable-5.14.0-1.1

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian.master/changelog b/debian.master/changelog
index 9cddcf199d824e871f90b6a9ca28e10687546349..8ea182184c0a2092043aa606915c12f398bafc25 100644 (file)
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,14 +1,24 @@
-linux-unstable (5.14.0-1.1) UNRELEASED; urgency=medium
+linux-unstable (5.14.0-1.1) impish; urgency=medium
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  * Packaging resync (LP: #1786013)
+    - update dkms package versions
+
+  * Miscellaneous Ubuntu changes
+    - [Packaging] bump kernel version to 5.14
+    - [Config] updateconfigs following 5.14-rc1 rebase
+    - [Config] update annotations
+    - [Packaging] FTBFS: disable zfs
+    - [Config] FTBFS: disable DELL_UART_BACKLIGHT
+    - [Config] FTBFS: disable ubuntu/xr-usb-serial
+
+  * Miscellaneous upstream changes
+    - Revert "UBUNTU: [Packaging] update variants"
 
   [ Upstream Kernel Changes ]
 
   * Rebase to v5.14-rc1
 
- -- Paolo Pisati <paolo.pisati@canonical.com>  Tue, 13 Jul 2021 15:57:05 +0200
+ -- Paolo Pisati <paolo.pisati@canonical.com>  Fri, 16 Jul 2021 15:20:04 +0200
 
 linux-unstable (5.14.0-0.0) impish; urgency=medium
 

diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index 3b250f2ad318ba4aebfdcadc7f74ea391da4e44c..ca916d098dabfe85979d791e4534bf1def02ef84 100644 (file)
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -1,50 +1 @@
-# Recreate any symlinks created since the orig.
-# Remove any files deleted from the orig.
-chmod +x 'debian/cloud-tools/hv_get_dhcp_info'
-chmod +x 'debian/cloud-tools/hv_get_dns_info'
-chmod +x 'debian/cloud-tools/hv_set_ifconfig'
-chmod +x 'debian/rules'
-chmod +x 'debian/scripts/abi-check'
-chmod +x 'debian/scripts/config-check'
-chmod +x 'debian/scripts/control-create'
-chmod +x 'debian/scripts/dkms-build'
-chmod +x 'debian/scripts/dkms-build--nvidia-N'
-chmod +x 'debian/scripts/file-downloader'
-chmod +x 'debian/scripts/helpers/close'
-chmod +x 'debian/scripts/helpers/open'
-chmod +x 'debian/scripts/helpers/rebase'
-chmod +x 'debian/scripts/link-headers'
-chmod +x 'debian/scripts/misc/arch-has-odm-enabled.sh'
-chmod +x 'debian/scripts/misc/final-checks'
-chmod +x 'debian/scripts/misc/find-missing-sauce.sh'
-chmod +x 'debian/scripts/misc/find-obsolete-firmware'
-chmod +x 'debian/scripts/misc/fw-to-ihex.sh'
-chmod +x 'debian/scripts/misc/gen-auto-reconstruct'
-chmod +x 'debian/scripts/misc/get-firmware'
-chmod +x 'debian/scripts/misc/getabis'
-chmod +x 'debian/scripts/misc/git-ubuntu-log'
-chmod +x 'debian/scripts/misc/insert-changes.pl'
-chmod +x 'debian/scripts/misc/insert-mainline-changes'
-chmod +x 'debian/scripts/misc/insert-ubuntu-changes'
-chmod +x 'debian/scripts/misc/kernelconfig'
-chmod +x 'debian/scripts/misc/retag'
-chmod +x 'debian/scripts/misc/splitconfig.pl'
-chmod +x 'debian/scripts/misc/tristate.sh'
-chmod +x 'debian/scripts/misc/update-aufs.sh'
-chmod +x 'debian/scripts/module-check'
-chmod +x 'debian/scripts/module-inclusion'
-chmod +x 'debian/scripts/retpoline-check'
-chmod +x 'debian/scripts/retpoline-extract'
-chmod +x 'debian/scripts/retpoline-extract-one'
-chmod +x 'debian/templates/extra.postinst.in'
-chmod +x 'debian/templates/extra.postrm.in'
-chmod +x 'debian/templates/headers.postinst.in'
-chmod +x 'debian/templates/image.postinst.in'
-chmod +x 'debian/templates/image.postrm.in'
-chmod +x 'debian/templates/image.preinst.in'
-chmod +x 'debian/templates/image.prerm.in'
-chmod +x 'debian/tests-build/check-aliases'
-chmod +x 'debian/tests/rebuild'
-chmod +x 'debian/tests/ubuntu-regression-suite'
-chmod +x 'update-version-dkms'
 exit 0