From 7bcc8316f227577a225b2603eea8363b9afed2bb Mon Sep 17 00:00:00 2001
From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 12 Dec 2022 10:05:03 +0100
Subject: [PATCH] UBUNTU: Ubuntu-6.1.0-1.1

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.master/changelog   | 58 +++++++++++++++++++++++++++++++++++----
 debian.master/reconstruct | 53 +++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/debian.master/changelog b/debian.master/changelog
index fcd6213c1d5d..ef4852dea1d4 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,10 +1,58 @@
-linux (6.1.0-1.1) UNRELEASED; urgency=medium
+linux (6.1.0-1.1) lunar; 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.
+  * lunar/linux: 6.1.0-1.1 -proposed tracker (LP: #1999373)
 
- -- Andrea Righi <andrea.righi@canonical.com>  Mon, 12 Dec 2022 09:58:38 +0100
+  * Packaging resync (LP: #1786013)
+    - [Packaging] update variants
+
+  * Miscellaneous Ubuntu changes
+    - [Packaging] annotations: set and delete configs from command line
+    - [Packaging] migrateconfigs: ignore README.rst if it doesn't exist
+    - [Packaging] migrate-annotations: properly determine arches in derivatives
+    - [Packaging] annotations: allow to set note to config options directly
+    - [Packaging] annotations: assume --query as default command
+    - [Packaging] annotations: allow to query using CONFIG_<option> or <option>
+    - [Packaging] annotations: support flavour inheritance
+    - [Packaging] annotations: properly merge configs with includes
+    - [Packaging] annotations: accept config options with or without CONFIG_
+      prefix
+    - [Packaging] annotations: clarify error message with --import
+    - [Packaging] annotations: properly support multiple levels of inclusion
+    - [Packaging] annotations: catch syntax errors in annotations
+    - [Packaging] kernelconfig: report arch and flavour in config-check log
+    - [Packaging] annotations: prevent generating .pyc files on import
+    - [Packaging] annotations: prevent python broken pipe errors
+    - [Packaging] annotations: allow to specify --write and --note at the same
+      time
+    - [Packaging] annotations: add an option to enable config autocompletion in
+      bash
+    - [Packaging] annotations: introduce --source
+    - [Packaging] annotations: add missing CONFIG_ prefix in main()
+    - [Packaging] Remove obsolete etc/kernelconfig
+    - [Packaging] Rewrite debian/scripts/abi-check in Python
+    - [Packaging] Simplify debian/scripts/module-check
+    - [Packaging] Clean up debian/scripts/module-check
+    - [Packaging] Move checker scripts to debian/scripts/checks
+    - [Packaging] mark phony targets
+    - [Packaging] Make the compiler for fix-filenames explicit
+    - [Packaging] add -rR MAKEFLAGS to clear implicit rules
+    - [Packaging] use dpkg-parsechangelog to get package name and series
+    - [Packaging] simplify revision/release
+    - [Packaging] simplify custom_override
+    - [Packaging] Remove meaningless code in install-arch-headers
+    - [Packaging] use olddefconfig in stamp-prepare-tree
+    - [Packaging] use parralel builds in more places
+    - [Packaging] install headers to debian/linux-libc-dev directly
+    - [Packaging] simplify abinum and uploadnum definitions
+    - [Packaging] Remove unused INSTALL_FW_PATH
+    - [Packaging] Merge install commands
+    - [Config] clean up deprecated notes in annotations
+    - [Packaging] automatically apply changes to annotations and drop
+      importconfigs
+    - [Packaging] kernelconfig: drop listnewconfigs
+    - [Packaging] annotations: do not hijack CONFIGS/* to update annotations
+
+ -- Andrea Righi <andrea.righi@canonical.com>  Mon, 12 Dec 2022 10:05:03 +0100
 
 linux (6.1.0-0.0) lunar; urgency=medium
 
diff --git a/debian.master/reconstruct b/debian.master/reconstruct
index ca916d098dab..657c0b17894f 100644
--- a/debian.master/reconstruct
+++ b/debian.master/reconstruct
@@ -1 +1,54 @@
+# 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/checks/abi-check'
+chmod +x 'debian/scripts/checks/config-check'
+chmod +x 'debian/scripts/checks/module-check'
+chmod +x 'debian/scripts/checks/module-signature-check'
+chmod +x 'debian/scripts/checks/retpoline-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/dkms-build-configure--zfs'
+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/annotations'
+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/fw-to-ihex.sh'
+chmod +x 'debian/scripts/misc/gen-auto-reconstruct'
+chmod +x 'debian/scripts/misc/getabis'
+chmod +x 'debian/scripts/misc/git-ubuntu-log'
+chmod +x 'debian/scripts/misc/insert-changes'
+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/migrate-annotations'
+chmod +x 'debian/scripts/misc/retag'
+chmod +x 'debian/scripts/misc/splitconfig.pl'
+chmod +x 'debian/scripts/misc/update-aufs.sh'
+chmod +x 'debian/scripts/module-inclusion'
+chmod +x 'debian/scripts/retpoline-extract'
+chmod +x 'debian/scripts/retpoline-extract-one'
+chmod +x 'debian/scripts/sign-module'
+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 'drivers/watchdog/f71808e_wdt.c'
+chmod +x 'update-dkms-versions'
+chmod +x 'update-version-dkms'
 exit 0