- Logical matches what is in kinetic - $ git range-diff pkg/import/1%2.6.1-1..ahasenack/logical/1%2.6.1-1ubuntu1 pkg/import/1%2.6.1-2..ahasenack/kinetic-nfsutils-merge 2: 4083b817 < -: -------- - d/NEWS: explain some of the major changes in 2.6.x - we have dropped d/NEWS , but upgrades need to go through Jammy and there it is. Also this is now present per pkg 3: a45a1920 ! 2: b9332ea6 - Don't install the regex module, as it's built by src:libnfsidmap-regex which is in Universe (MIR: #1960824) + d/control: don't conflict/break/e - regex only context noise 4: 92113f8f ! 3: da56db7d - Update README files: + d/README.Ubuntu: explains some of the packaging decisions + d/README.Debian.nfsv4: removed as the content is out of date - Readme.Ubuntu lost some content to be added later as moved from NEWS - seems ok 5: adc7845e < -: -------- - d/nfsconvert.py: add short "u" option for mountd's no-udp present in Debian 8: 3bdc8b3d < -: -------- - d/nfs-*.bug-script: update to also include /etc/nfs.conf and /etc/nfs.conf.d/*.conf That far it is ok, the last section are all new changes which I'll also review one by one ... 565a151b * Dropped: - d/nfsconvert.py: add short "u" option for mountd's no-udp [Included in 1:2.6.1-2] d22206d0 - d/NEWS: explain some of the major changes in 2.6.x [Obsoleted by Debian's update to the per-package NEWS files] 2b54f858 - d/nfs-*.bug-script: update to also include /etc/nfs.conf and /etc/nfs.conf.d/*.conf [Included in 1:2.6.1-2] ^^ ok, just for changelog generation 9b5dd4e4 * Added changes: - New binary package libnfsidmap-regex (LP: #1974067): + d/control: new package + d/libnfsidmap-regex.install: install the plugin file + d/not-installed: remove the plugin from the not-installed list + d/p/remove-regex-from-docs.patch: deleted + d/p/ubuntu-idmapd-manpage-update-regex-other-package.patch: note that the regex plugin is in another package Just to ensure I got this right, we are adding regex, not moving it. I checked regex.so wasn't present, so no need for breaks/replaces due to reorg. Well it wasn't present from this source. But the binary pkg is removed in kinetic and this upload should thereby not conflict. It should upgrade the former version just fine. 78f3ad56 - rpc.svcgssd fixes and improvements (LP: #1977745): + d/p/svcgssd-fix-use-after-free.patch: fix use-after-free which was preventing svcgssd options set in /etc/nfs.conf from being used ok 30ff1d49 + d/p/svcgssd-display-principal-if-set.patch: improve logging, showing the expected principal name if it was set in the config 2bb1bc06 + d/p/svcgssd-document-missing-options.patch: add missing options to the svcgssd manpage 1591ebd6 + d/p/nfs-conf-manpage-missing-svcgssd-options.patch: also document the missing svcgssd options to the nfs.conf(5) manpage all good changes, upstream refs ok a6477222 - d/README.Ubuntu: updated with the content of the previous d/NEWS file Ok, this indeed carries the info formerly present in other places. a14d87d1 merge-changelogs c2e99ba0 reconstruct-changelog ffa6e554 update-maintainer ^^ all ok, nothing special 5eb96fa4 changelog: fix bug reference ok, but the change it fixes is new as well and you have fixed the commit message. You could as well squash this into "c2e99ba0 reconstruct-changelog"